Subject: Re: kern/32161: m68k a.out emulation broken
To: None <christos@zoulas.com>
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
List: netbsd-bugs
Date: 05/04/2006 17:13:09
> Is the ktrace the same?

BTW kdump(1) doesn't support aoutm68k (and m68k4k) emul stuff.
---
Izumi Tsutsui


Index: sys/compat/aoutm68k/Makefile
===================================================================
RCS file: /cvsroot/src/sys/compat/aoutm68k/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/compat/aoutm68k/Makefile	11 Dec 2005 12:19:56 -0000	1.5
+++ sys/compat/aoutm68k/Makefile	4 May 2006 08:06:47 -0000
@@ -8,7 +8,6 @@
 
 ${OBJS}: ${DEP}
 	${HOST_SH} ../../kern/makesyscalls.sh syscalls.conf syscalls.master
-	rm -f aoutm68k_syscalls.c	# garbage-collect, not needed
 
 all: ${OBJS}
 
Index: usr.bin/kdump/Makefile
===================================================================
RCS file: /cvsroot/src/usr.bin/kdump/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- usr.bin/kdump/Makefile	16 Jul 2005 22:00:01 -0000	1.26
+++ usr.bin/kdump/Makefile	4 May 2006 08:06:47 -0000
@@ -11,6 +11,9 @@
 WFORMAT=1
 WARNS=3
 
+.if (${MACHINE_ARCH} == "m68k")
+CPPFLAGS+=-DAOUTM68K
+.endif
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=-static
 .endif
Index: usr.bin/kdump/setemul.c
===================================================================
RCS file: /cvsroot/src/usr.bin/kdump/setemul.c,v
retrieving revision 1.21
diff -u -r1.21 setemul.c
--- usr.bin/kdump/setemul.c	9 Feb 2006 19:18:57 -0000	1.21
+++ usr.bin/kdump/setemul.c	4 May 2006 08:06:47 -0000
@@ -105,6 +105,9 @@
 #include "../../sys/compat/svr4/svr4_syscall.h"
 #include "../../sys/compat/svr4_32/svr4_32_syscall.h"
 #include "../../sys/compat/ultrix/ultrix_syscall.h"
+#ifdef AOUTM68K
+#include "../../sys/compat/aoutm68k/aoutm68k_syscall.h"
+#endif
 
 #define KTRACE
 #include "../../sys/kern/syscalls.c"
@@ -126,6 +129,9 @@
 #include "../../sys/compat/svr4/svr4_syscalls.c"
 #include "../../sys/compat/svr4_32/svr4_32_syscalls.c"
 #include "../../sys/compat/ultrix/ultrix_syscalls.c"
+#ifdef AOUTM68K
+#include "../../sys/compat/aoutm68k/aoutm68k_syscalls.c"
+#endif
 
 #include "../../sys/compat/hpux/hpux_errno.c"
 #include "../../sys/compat/svr4/svr4_errno.c"
@@ -234,6 +240,12 @@
 	  NULL,				0,
 	  NULL,				0,	0 },
 
+#ifdef AOUTM68K
+	{ "aoutm68k",	aoutm68k_syscallnames,	AOUTM68K_SYS_MAXSYSCALL,
+	  NULL,				0,
+	  NULL,				0,	0 },
+#endif
+
 	{ NULL,		NULL,			0,
 	  NULL,				0,
 	  NULL,				0,	0 }