Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/linux/arch/m68k sync with i386, so that exec_conf...



details:   https://anonhg.NetBSD.org/src/rev/15e83128efd0
branches:  trunk
changeset: 500518:15e83128efd0
user:      itohy <itohy%NetBSD.org@localhost>
date:      Wed Dec 13 03:49:51 2000 +0000

description:
sync with i386, so that exec_conf.c compiles again

diffstat:

 sys/compat/linux/arch/m68k/linux_exec.h |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r a02563a393be -r 15e83128efd0 sys/compat/linux/arch/m68k/linux_exec.h
--- a/sys/compat/linux/arch/m68k/linux_exec.h   Wed Dec 13 03:17:53 2000 +0000
+++ b/sys/compat/linux/arch/m68k/linux_exec.h   Wed Dec 13 03:49:51 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_exec.h,v 1.2 2000/11/17 03:55:18 erh Exp $       */
+/*     $NetBSD: linux_exec.h,v 1.3 2000/12/13 03:49:51 itohy Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,11 @@
 #define LINUX_GCC_SIGNATURE    1
 
 #define LINUX_ELF_AUX_ARGSIZ \
-       (howmany(ELF_AUX_ENTRIES * sizeof(AuxInfo), sizeof(Elf_Addr)))
+       (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr)))
+#ifdef ELF32NAME
+#define LINUX_COPYARGS_FUNCTION        ELF32NAME(copyargs)
+#else
 #define LINUX_COPYARGS_FUNCTION        ELFNAME(copyargs)
+#endif
 
 #endif /* !_M68K_LINUX_EXEC_H */



Home | Main Index | Thread Index | Old Index