include syscallnames only if compiling w/ SYSCALL_DEBUG.

was already so for native and sunos, the rest was just
wasting space on it. niels@ millert@ ok

19 files changed, 90 insertions, 31 deletions

diff --git a/sys/compat/bsdos/bsdos_exec.c b/sys/compat/bsdos/bsdos_exec.c
index 6e3bf9019c1..b6c5ea1686e 100644
--- a/sys/compat/bsdos/bsdos_exec.c
+++ b/sys/compat/bsdos/bsdos_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsdos_exec.c,v 1.1 1997/09/02 08:54:12 downsj Exp $	*/
+/*	$OpenBSD: bsdos_exec.c,v 1.2 1999/11/10 15:55:13 mickey Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -47,7 +47,9 @@
 #include <compat/bsdos/bsdos_syscall.h>
 
 extern struct sysent bsdos_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *bsdos_syscallnames[];
+#endif
 
 extern void sendsig __P((sig_t, int, int, u_long, int, union sigval));
 extern char sigcode[], esigcode[];
@@ -59,7 +61,11 @@ struct emul emul_bsdos = {
 	BSDOS_SYS_syscall,
 	BSDOS_SYS_MAXSYSCALL,
 	bsdos_sysent,
+#ifdef SYSCALL_DEBUG
 	bsdos_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	setregs,
diff --git a/sys/compat/bsdos/files.bsdos b/sys/compat/bsdos/files.bsdos
index bbca06e376a..66854b8dc7f 100644
--- a/sys/compat/bsdos/files.bsdos
+++ b/sys/compat/bsdos/files.bsdos
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.bsdos,v 1.1 1997/09/02 08:54:16 downsj Exp $
+#	$OpenBSD: files.bsdos,v 1.2 1999/11/10 15:55:13 mickey Exp $
 #
 # Config file description for machine-independent BSD/OS compat code.
 # Included by ports that need it.
@@ -8,4 +8,4 @@
 
 file	compat/bsdos/bsdos_exec.c		compat_bsdos
 file	compat/bsdos/bsdos_sysent.c		compat_bsdos
-file	compat/bsdos/bsdos_syscalls.c		compat_bsdos
+file	compat/bsdos/bsdos_syscalls.c		compat_bsdos & syscall_debug
diff --git a/sys/compat/freebsd/files.freebsd b/sys/compat/freebsd/files.freebsd
index b66d725ffff..4f8999b5814 100644
--- a/sys/compat/freebsd/files.freebsd
+++ b/sys/compat/freebsd/files.freebsd
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.freebsd,v 1.2 1996/08/02 20:34:44 niklas Exp $
+#	$OpenBSD: files.freebsd,v 1.3 1999/11/10 15:55:20 mickey Exp $
 #	$NetBSD: files.freebsd,v 1.1 1995/10/10 01:19:26 mycroft Exp $
 #
 # Config.new file description for machine-independent FreeBSD compat code.
@@ -13,4 +13,4 @@ file	compat/freebsd/freebsd_ioctl.c		compat_freebsd
 file	compat/freebsd/freebsd_misc.c		compat_freebsd
 file	compat/freebsd/freebsd_ptrace.c		compat_freebsd
 file	compat/freebsd/freebsd_sysent.c		compat_freebsd
-file	compat/freebsd/freebsd_syscalls.c	compat_freebsd
+file	compat/freebsd/freebsd_syscalls.c	compat_freebsd & syscall_debug
diff --git a/sys/compat/freebsd/freebsd_exec.c b/sys/compat/freebsd/freebsd_exec.c
index 0ec938b3e01..350b9612031 100644
--- a/sys/compat/freebsd/freebsd_exec.c
+++ b/sys/compat/freebsd/freebsd_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_exec.c,v 1.7 1999/09/10 20:45:26 kstailey Exp $	*/
+/*	$OpenBSD: freebsd_exec.c,v 1.8 1999/11/10 15:55:20 mickey Exp $	*/
 /*	$NetBSD: freebsd_exec.c,v 1.2 1996/05/18 16:02:08 christos Exp $	*/
 
 /*
@@ -49,7 +49,9 @@
 #include <compat/freebsd/freebsd_util.h>
 
 extern struct sysent freebsd_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *freebsd_syscallnames[];
+#endif
 
 extern const char freebsd_emul_path[];
 
@@ -60,7 +62,11 @@ struct emul emul_aout_freebsd = {
 	FREEBSD_SYS_syscall,
 	FREEBSD_SYS_MAXSYSCALL,
 	freebsd_sysent,
+#ifdef SYSCALL_DEBUG
 	freebsd_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	setregs,
@@ -76,7 +82,11 @@ struct emul emul_elf_freebsd = {
 	FREEBSD_SYS_syscall,
 	FREEBSD_SYS_MAXSYSCALL,
 	freebsd_sysent,
+#ifdef SYSCALL_DEBUG
 	freebsd_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	setregs,
diff --git a/sys/compat/hpux/files.hpux b/sys/compat/hpux/files.hpux
index e9d746a16a0..df140664811 100644
--- a/sys/compat/hpux/files.hpux
+++ b/sys/compat/hpux/files.hpux
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hpux,v 1.3 1996/08/02 20:34:52 niklas Exp $
+#	$OpenBSD: files.hpux,v 1.4 1999/11/10 15:55:21 mickey Exp $
 #	$NetBSD: files.hpux,v 1.2 1995/11/28 08:39:52 thorpej Exp $
 #
 # Config.new file description for machine-independent HPUX compat code.
@@ -12,6 +12,6 @@ file	compat/hpux/hpux_file.c		compat_hpux
 file	compat/hpux/hpux_exec.c		compat_hpux
 file	compat/hpux/hpux_net.c		compat_hpux
 file	compat/hpux/hpux_sig.c		compat_hpux
-file	compat/hpux/hpux_syscalls.c	compat_hpux
+file	compat/hpux/hpux_syscalls.c	compat_hpux & syscall_debug
 file	compat/hpux/hpux_sysent.c	compat_hpux
 file	compat/hpux/hpux_tty.c		compat_hpux
diff --git a/sys/compat/hpux/hpux_exec.c b/sys/compat/hpux/hpux_exec.c
index 8092e485a39..eb3bcf44927 100644
--- a/sys/compat/hpux/hpux_exec.c
+++ b/sys/compat/hpux/hpux_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hpux_exec.c,v 1.9 1997/06/17 11:11:08 deraadt Exp $	*/
+/*	$OpenBSD: hpux_exec.c,v 1.10 1999/11/10 15:55:21 mickey Exp $	*/
 /*	$NetBSD: hpux_exec.c,v 1.8 1997/03/16 10:14:44 thorpej Exp $	*/
 
 /*
@@ -66,7 +66,9 @@
 const char hpux_emul_path[] = "/emul/hpux";
 extern char sigcode[], esigcode[];
 extern struct sysent hpux_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *hpux_syscallnames[];
+#endif
 extern int bsdtohpuxerrnomap[];
 
 static	int exec_hpux_prep_nmagic __P((struct proc *, struct exec_package *));
@@ -80,7 +82,11 @@ struct emul emul_hpux = {
 	HPUX_SYS_syscall,
 	HPUX_SYS_MAXSYSCALL,
 	hpux_sysent,
+#ifdef SYSCALL_DEBUG
 	hpux_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	hpux_setregs,
diff --git a/sys/compat/ibcs2/files.ibcs2 b/sys/compat/ibcs2/files.ibcs2
index eca984870e5..c107894e3fe 100644
--- a/sys/compat/ibcs2/files.ibcs2
+++ b/sys/compat/ibcs2/files.ibcs2
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.ibcs2,v 1.5 1997/01/23 16:12:15 niklas Exp $
+#	$OpenBSD: files.ibcs2,v 1.6 1999/11/10 15:55:21 mickey Exp $
 #	$NetBSD: files.ibcs2,v 1.3 1995/08/14 01:34:09 mycroft Exp $
 #
 # Config file description for machine-independent IBCS-2 compat code.
@@ -16,5 +16,5 @@ file	compat/ibcs2/ibcs2_misc.c	compat_ibcs2
 file	compat/ibcs2/ibcs2_signal.c	compat_ibcs2
 file	compat/ibcs2/ibcs2_socksys.c	compat_ibcs2
 file	compat/ibcs2/ibcs2_stat.c	compat_ibcs2
-file	compat/ibcs2/ibcs2_syscalls.c	compat_ibcs2
+file	compat/ibcs2/ibcs2_syscalls.c	compat_ibcs2 & syscall_debug
 file	compat/ibcs2/ibcs2_sysent.c	compat_ibcs2
diff --git a/sys/compat/ibcs2/ibcs2_exec.c b/sys/compat/ibcs2/ibcs2_exec.c
index 95f56cb1dda..23eb34e0d70 100644
--- a/sys/compat/ibcs2/ibcs2_exec.c
+++ b/sys/compat/ibcs2/ibcs2_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_exec.c,v 1.9 1999/01/11 05:12:12 millert Exp $	*/
+/*	$OpenBSD: ibcs2_exec.c,v 1.10 1999/11/10 15:55:21 mickey Exp $	*/
 /*	$NetBSD: ibcs2_exec.c,v 1.12 1996/10/12 02:13:52 thorpej Exp $	*/
 
 /*
@@ -76,7 +76,9 @@ static int coff_find_section __P((struct proc *, struct vnode *,
 
 extern int bsd2ibcs_errno[];
 extern struct sysent ibcs2_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *ibcs2_syscallnames[];
+#endif
 extern void ibcs2_sendsig __P((sig_t, int, int, u_long, int, union sigval));
 extern char sigcode[], esigcode[];
 
@@ -89,7 +91,11 @@ struct emul emul_ibcs2 = {
 	0,
 	IBCS2_SYS_MAXSYSCALL,
 	ibcs2_sysent,
+#ifdef SYSCALL_DEBUG
 	ibcs2_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	setregs,
diff --git a/sys/compat/linux/files.linux b/sys/compat/linux/files.linux
index c4bc64b8e5d..6590748ad2f 100644
--- a/sys/compat/linux/files.linux
+++ b/sys/compat/linux/files.linux
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.linux,v 1.6 1998/04/26 21:22:20 provos Exp $
+#	$OpenBSD: files.linux,v 1.7 1999/11/10 15:55:21 mickey Exp $
 #	$NetBSD: files.linux,v 1.4 1996/03/08 04:55:59 mycroft Exp $
 #
 # Config.new file description for machine-independent Linux compat code.
@@ -16,7 +16,7 @@ file	compat/linux/linux_ipc.c		compat_linux
 file	compat/linux/linux_misc.c		compat_linux
 file	compat/linux/linux_signal.c		compat_linux
 file	compat/linux/linux_socket.c		compat_linux
-file	compat/linux/linux_syscalls.c		compat_linux
+file	compat/linux/linux_syscalls.c		compat_linux & syscall_debug
 file	compat/linux/linux_sysent.c		compat_linux
 file	compat/linux/linux_termios.c		compat_linux
 file	compat/linux/linux_mount.c		compat_linux
diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c
index e7e82cbd84b..0ca350998be 100644
--- a/sys/compat/linux/linux_exec.c
+++ b/sys/compat/linux/linux_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_exec.c,v 1.11 1999/09/10 20:27:40 art Exp $	*/
+/*	$OpenBSD: linux_exec.c,v 1.12 1999/11/10 15:55:22 mickey Exp $	*/
 /*	$NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $	*/
 
 /*
@@ -72,7 +72,9 @@ const char linux_emul_path[] = "/emul/linux";
 extern int linux_error[];
 extern char linux_sigcode[], linux_esigcode[];
 extern struct sysent linux_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *linux_syscallnames[];
+#endif
 
 int exec_linux_aout_prep_zmagic __P((struct proc *, struct exec_package *));
 int exec_linux_aout_prep_nmagic __P((struct proc *, struct exec_package *));
@@ -86,7 +88,11 @@ struct emul emul_linux_aout = {
 	LINUX_SYS_syscall,
 	LINUX_SYS_MAXSYSCALL,
 	linux_sysent,
+#ifdef SYSCALL_DEBUG
 	linux_syscallnames,
+#else
+	NULL,
+#endif
 	LINUX_AOUT_AUX_ARGSIZ,
 	linux_aout_copyargs,
 	setregs,
@@ -102,7 +108,11 @@ struct emul emul_linux_elf = {
 	LINUX_SYS_syscall,
 	LINUX_SYS_MAXSYSCALL,
 	linux_sysent,
+#ifdef SYSCALL_DEBUG
 	linux_syscallnames,
+#else
+	NULL,
+#endif
 	LINUX_ELF_AUX_ARGSIZ,
 	elf_copyargs,
 	setregs,
diff --git a/sys/compat/netbsd/files.netbsd b/sys/compat/netbsd/files.netbsd
index 2cc5ea32ba9..f13f817bdc5 100644
--- a/sys/compat/netbsd/files.netbsd
+++ b/sys/compat/netbsd/files.netbsd
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.netbsd,v 1.6 1999/09/17 22:14:08 kstailey Exp $
+#	$OpenBSD: files.netbsd,v 1.7 1999/11/10 15:55:22 mickey Exp $
 #
 # Config.new file description for machine-independent NetBSD compat code.
 # Included by ports that need it.
@@ -15,4 +15,4 @@ file	compat/netbsd/netbsd_pos_io.c		compat_netbsd
 file	compat/netbsd/netbsd_signal.c		compat_netbsd
 file	compat/netbsd/netbsd_stat.c		compat_netbsd
 file	compat/netbsd/netbsd_sysent.c		compat_netbsd
-file	compat/netbsd/netbsd_syscalls.c		compat_netbsd
+file	compat/netbsd/netbsd_syscalls.c		compat_netbsd & syscall_debug
diff --git a/sys/compat/netbsd/netbsd_exec.c b/sys/compat/netbsd/netbsd_exec.c
index 56233a823b7..40f7575dc6f 100644
--- a/sys/compat/netbsd/netbsd_exec.c
+++ b/sys/compat/netbsd/netbsd_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_exec.c,v 1.5 1999/09/26 11:07:32 kstailey Exp $	 */
+/*	$OpenBSD: netbsd_exec.c,v 1.6 1999/11/10 15:55:22 mickey Exp $	 */
 /*	$NetBSD: svr4_exec.c,v 1.16 1995/10/14 20:24:20 christos Exp $	 */
 
 /*
@@ -59,8 +59,9 @@ static void *netbsd_elf64_copyargs __P((struct exec_package *,
 
 extern char netbsd_sigcode[], netbsd_esigcode[];
 extern struct sysent netbsd_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *netbsd_syscallnames[];
-
+#endif
 
 struct emul emul_elf64_netbsd = {
 	"netbsd",
@@ -69,7 +70,11 @@ struct emul emul_elf64_netbsd = {
 	NETBSD_SYS_syscall,
 	NETBSD_SYS_MAXSYSCALL,
 	netbsd_sysent,
+#ifdef SYSCALL_DEBUG
 	netbsd_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	netbsd_elf64_copyargs,
 	setregs,
diff --git a/sys/compat/osf1/files.osf1 b/sys/compat/osf1/files.osf1
index 615680275e8..4c1292ad6a2 100644
--- a/sys/compat/osf1/files.osf1
+++ b/sys/compat/osf1/files.osf1
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.osf1,v 1.3 1996/08/02 20:35:25 niklas Exp $
+#	$OpenBSD: files.osf1,v 1.4 1999/11/10 15:55:22 mickey Exp $
 #	$NetBSD: files.osf1,v 1.3 1995/11/15 05:42:17 cgd Exp $
 #
 # Config file description for machine-independent OSF/1 compat code.
@@ -13,5 +13,5 @@ file	compat/osf1/osf1_ioctl.c	compat_osf1
 file	compat/osf1/osf1_misc.c		compat_osf1
 file	compat/osf1/osf1_mount.c	compat_osf1
 file	compat/osf1/osf1_signal.c	compat_osf1
-file	compat/osf1/osf1_syscalls.c	compat_osf1
+file	compat/osf1/osf1_syscalls.c	compat_osf1 & syscall_debug
 file	compat/osf1/osf1_sysent.c	compat_osf1
diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c
index 9c1e872102d..272308b3272 100644
--- a/sys/compat/osf1/osf1_misc.c
+++ b/sys/compat/osf1/osf1_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_misc.c,v 1.10 1998/03/01 17:00:22 niklas Exp $	*/
+/*	$OpenBSD: osf1_misc.c,v 1.11 1999/11/10 15:55:23 mickey Exp $	*/
 /*	$NetBSD: osf1_misc.c,v 1.7 1995/10/07 06:53:04 mycroft Exp $	*/
 
 /*
@@ -54,10 +54,10 @@
 
 #ifdef SYSCALL_DEBUG
 extern int scdebug;
+extern char *osf1_syscallnames[];
 #endif
 
 extern struct sysent osf1_sysent[];
-extern char *osf1_syscallnames[];
 extern void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *,
 					u_long, register_t *));
 
@@ -72,7 +72,11 @@ struct emul emul_osf1 = {
 	OSF1_SYS_syscall,
 	OSF1_SYS_MAXSYSCALL,
 	osf1_sysent,
+#ifdef SYSCALL_DEBUG
 	osf1_syscallnames,
+#else
+	NULL,
+#endif
 	0,
 	copyargs,
 	cpu_exec_ecoff_setregs,
diff --git a/sys/compat/sunos/files.sunos b/sys/compat/sunos/files.sunos
index 1943bafed5d..5f706c5d9b3 100644
--- a/sys/compat/sunos/files.sunos
+++ b/sys/compat/sunos/files.sunos
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sunos,v 1.2 1996/08/02 20:35:31 niklas Exp $
+#	$OpenBSD: files.sunos,v 1.3 1999/11/10 15:55:23 mickey Exp $
 #	$NetBSD: files.sunos,v 1.3 1995/06/24 20:22:33 christos Exp $
 #
 # Config.new file description for machine-independent SunOS compat code.
@@ -11,4 +11,4 @@ file	compat/sunos/sunos_exec.c	compat_sunos
 file	compat/sunos/sunos_sysent.c	compat_sunos
 file	compat/sunos/sunos_ioctl.c	compat_sunos
 file	compat/sunos/sunos_misc.c	compat_sunos
-#file	compat/sunos/sunos_syscalls.c	compat_sunos
+file	compat/sunos/sunos_syscalls.c	compat_sunos & syscall_debug
diff --git a/sys/compat/svr4/files.svr4 b/sys/compat/svr4/files.svr4
index 0effe41ed41..f9f8c5cc0a3 100644
--- a/sys/compat/svr4/files.svr4
+++ b/sys/compat/svr4/files.svr4
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.svr4,v 1.7 1998/03/06 22:04:11 niklas Exp $
+#	$OpenBSD: files.svr4,v 1.8 1999/11/10 15:55:23 mickey Exp $
 #	$NetBSD: files.svr4,v 1.7 1996/05/05 17:14:25 mrg Exp $
 #
 # Config.new file description for machine-independent SVR4 compat code.
@@ -21,7 +21,7 @@ file	compat/svr4/svr4_socket.c	compat_svr4
 file	compat/svr4/svr4_sockio.c	compat_svr4
 file	compat/svr4/svr4_stat.c		compat_svr4
 file	compat/svr4/svr4_stream.c	compat_svr4
-file	compat/svr4/svr4_syscalls.c	compat_svr4
+file	compat/svr4/svr4_syscalls.c	compat_svr4 & syscall_debug
 file	compat/svr4/svr4_sysent.c	compat_svr4
 file	compat/svr4/svr4_termios.c	compat_svr4
 file	compat/svr4/svr4_ttold.c	compat_svr4
diff --git a/sys/compat/svr4/svr4_exec.c b/sys/compat/svr4/svr4_exec.c
index 599af56ebc9..5ffb76eb8f5 100644
--- a/sys/compat/svr4/svr4_exec.c
+++ b/sys/compat/svr4/svr4_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_exec.c,v 1.8 1999/09/10 20:08:13 art Exp $	 */
+/*	$OpenBSD: svr4_exec.c,v 1.9 1999/11/10 15:55:23 mickey Exp $	 */
 /*	$NetBSD: svr4_exec.c,v 1.16 1995/10/14 20:24:20 christos Exp $	 */
 
 /*
@@ -59,7 +59,9 @@ const char svr4_emul_path[] = "/emul/svr4";
 extern int svr4_error[];
 extern char svr4_sigcode[], svr4_esigcode[];
 extern struct sysent svr4_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *svr4_syscallnames[];
+#endif
 
 struct emul emul_svr4 = {
 	"svr4",
@@ -68,7 +70,11 @@ struct emul emul_svr4 = {
 	SVR4_SYS_syscall,
 	SVR4_SYS_MAXSYSCALL,
 	svr4_sysent,
+#ifdef SYSCALL_DEBUG
 	svr4_syscallnames,
+#else
+	NULL,
+#endif
 	SVR4_AUX_ARGSIZ,
 	svr4_copyargs,
 	setregs,
diff --git a/sys/compat/ultrix/files.ultrix b/sys/compat/ultrix/files.ultrix
index 08017990b89..bf12eb5ee05 100644
--- a/sys/compat/ultrix/files.ultrix
+++ b/sys/compat/ultrix/files.ultrix
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.ultrix,v 1.4 1996/08/02 20:35:50 niklas Exp $
+#	$OpenBSD: files.ultrix,v 1.5 1999/11/10 15:55:24 mickey Exp $
 #	$NetBSD: files.ultrix,v 1.3 1996/01/07 13:38:49 jonathan Exp $
 #
 # Config file description for machine-independent Ultrix compat code.
@@ -10,6 +10,6 @@
 file	compat/ultrix/ultrix_pathname.c		compat_ultrix
 file	compat/ultrix/ultrix_ioctl.c		compat_ultrix
 file	compat/ultrix/ultrix_misc.c		compat_ultrix
-file	compat/ultrix/ultrix_syscalls.c		compat_ultrix
+file	compat/ultrix/ultrix_syscalls.c		compat_ultrix & syscall_debug
 file	compat/ultrix/ultrix_sysent.c		compat_ultrix
 file	compat/ultrix/ultrix_fs.c		compat_ultrix
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index b09bfd6cb9c..6900e77a56b 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_misc.c,v 1.14 1999/06/01 17:54:32 pefo Exp $	*/
+/*	$OpenBSD: ultrix_misc.c,v 1.15 1999/11/10 15:55:24 mickey Exp $	*/
 /*	$NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $	*/
 
 /*
@@ -129,7 +129,9 @@
 #include <sys/socketvar.h>				/* sosetopt() */
 
 extern struct sysent ultrix_sysent[];
+#ifdef SYSCALL_DEBUG
 extern char *ultrix_syscallnames[];
+#endif
 
 /*
  * Select the appropriate setregs callback for the target architecture.
@@ -154,7 +156,11 @@ struct emul emul_ultrix = {
 	ULTRIX_SYS_syscall,
 	ULTRIX_SYS_MAXSYSCALL,
 	ultrix_sysent,
+#ifdef SYSCALL_DEBUG
 	ultrix_syscallnames,
+#else
+	NULL
+#endif
 	0,
 	copyargs,
 	ULTRIX_EXEC_SETREGS,