summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2004-07-09 23:51:40 +0000
committerderaadt <deraadt@openbsd.org>2004-07-09 23:51:40 +0000
commit5dd8d5c551d7bcfe1e7296843d29ffed7b71b89a (patch)
tree48c4c8a6e9fbab7fa28b979e4e5e7f90d097c9e4
parentoops committed the old version (diff)
downloadwireguard-openbsd-5dd8d5c551d7bcfe1e7296843d29ffed7b71b89a.tar.xz
wireguard-openbsd-5dd8d5c551d7bcfe1e7296843d29ffed7b71b89a.zip
#ifdef hpux only for m68k or hppa; this needs a revisit since this shows
something flawed in the way that the emulation system calls are being handled
-rw-r--r--bin/systrace/openbsd-syscalls.c8
-rw-r--r--usr.bin/kdump/kdump.c10
2 files changed, 15 insertions, 3 deletions
diff --git a/bin/systrace/openbsd-syscalls.c b/bin/systrace/openbsd-syscalls.c
index a5956bf0eaf..b958e423206 100644
--- a/bin/systrace/openbsd-syscalls.c
+++ b/bin/systrace/openbsd-syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openbsd-syscalls.c,v 1.27 2004/07/09 23:42:50 mickey Exp $ */
+/* $OpenBSD: openbsd-syscalls.c,v 1.28 2004/07/09 23:51:42 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -36,7 +36,9 @@
#include <compat/bsdos/bsdos_syscall.h>
#include <compat/freebsd/freebsd_syscall.h>
#include <compat/netbsd/netbsd_syscall.h>
+#if defined(__hppa__) || defined(__m68k__)
#include <compat/hpux/hpux_syscall.h>
+#endif
#include <compat/ibcs2/ibcs2_syscall.h>
#include <compat/linux/linux_syscall.h>
#include <compat/osf1/osf1_syscall.h>
@@ -56,7 +58,9 @@
#include <compat/bsdos/bsdos_syscalls.c>
#include <compat/freebsd/freebsd_syscalls.c>
#include <compat/netbsd/netbsd_syscalls.c>
+#if defined(__hppa__) || defined(__m68k__)
#include <compat/hpux/hpux_syscalls.c>
+#endif
#include <compat/ibcs2/ibcs2_syscalls.c>
#include <compat/linux/linux_syscalls.c>
#include <compat/osf1/osf1_syscalls.c>
@@ -94,7 +98,9 @@ struct emulation {
static struct emulation emulations[] = {
{ "native", syscallnames, SYS_MAXSYSCALL },
{ "aout", syscallnames, SYS_MAXSYSCALL },
+#if defined(__hppa__) || defined(__m68k__)
{ "hpux", hpux_syscallnames, HPUX_SYS_MAXSYSCALL },
+#endif
{ "ibcs2", ibcs2_syscallnames, IBCS2_SYS_MAXSYSCALL },
{ "linux", linux_syscallnames, LINUX_SYS_MAXSYSCALL },
{ "osf1", osf1_syscallnames, OSF1_SYS_MAXSYSCALL },
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index f193a0f1b52..862bb304027 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdump.c,v 1.25 2004/07/09 21:52:21 mickey Exp $ */
+/* $OpenBSD: kdump.c,v 1.26 2004/07/09 23:51:40 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$OpenBSD: kdump.c,v 1.25 2004/07/09 21:52:21 mickey Exp $";
+static char *rcsid = "$OpenBSD: kdump.c,v 1.26 2004/07/09 23:51:40 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -76,7 +76,9 @@ pid_t pid = -1;
#include <compat/bsdos/bsdos_syscall.h>
#include <compat/freebsd/freebsd_syscall.h>
#include <compat/netbsd/netbsd_syscall.h>
+#if defined(__hppa__) || defined(__m68k__)
#include <compat/hpux/hpux_syscall.h>
+#endif
#include <compat/ibcs2/ibcs2_syscall.h>
#include <compat/linux/linux_syscall.h>
#include <compat/osf1/osf1_syscall.h>
@@ -98,7 +100,9 @@ pid_t pid = -1;
#include <compat/bsdos/bsdos_syscalls.c>
#include <compat/freebsd/freebsd_syscalls.c>
#include <compat/netbsd/netbsd_syscalls.c>
+#if defined(__hppa__) || defined(__m68k__)
#include <compat/hpux/hpux_syscalls.c>
+#endif
#include <compat/ibcs2/ibcs2_syscalls.c>
#include <compat/linux/linux_syscalls.c>
#include <compat/osf1/osf1_syscalls.c>
@@ -123,7 +127,9 @@ struct emulation {
static struct emulation emulations[] = {
{ "native", syscallnames, SYS_MAXSYSCALL },
+#if defined(__hppa__) || defined(__m68k__)
{ "hpux", hpux_syscallnames, HPUX_SYS_MAXSYSCALL },
+#endif
{ "ibcs2", ibcs2_syscallnames, IBCS2_SYS_MAXSYSCALL },
{ "linux", linux_syscallnames, LINUX_SYS_MAXSYSCALL },
{ "osf1", osf1_syscallnames, OSF1_SYS_MAXSYSCALL },