remove compat_osf1. ok deraadt miod

5 files changed, 6 insertions, 23 deletions

diff --git a/bin/systrace/openbsd-syscalls.c b/bin/systrace/openbsd-syscalls.c
index 4e8dbb73742..29b25d97333 100644
--- a/bin/systrace/openbsd-syscalls.c
+++ b/bin/systrace/openbsd-syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openbsd-syscalls.c,v 1.34 2010/06/29 20:30:32 guenther Exp $	*/
+/*	$OpenBSD: openbsd-syscalls.c,v 1.35 2010/06/30 20:46:51 tedu Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -37,7 +37,6 @@
 #include <compat/freebsd/freebsd_syscall.h>
 #include <compat/ibcs2/ibcs2_syscall.h>
 #include <compat/linux/linux_syscall.h>
-#include <compat/osf1/osf1_syscall.h>
 #include <compat/sunos/sunos_syscall.h>
 #include <compat/svr4/svr4_syscall.h>
 
@@ -56,7 +55,6 @@
 #include <compat/freebsd/freebsd_syscalls.c>
 #include <compat/ibcs2/ibcs2_syscalls.c>
 #include <compat/linux/linux_syscalls.c>
-#include <compat/osf1/osf1_syscalls.c>
 #include <compat/sunos/sunos_syscalls.c>
 #include <compat/svr4/svr4_syscalls.c>
 #undef KTRACE
@@ -94,7 +92,6 @@ static struct emulation emulations[] = {
 	{ "aout",	syscallnames,		SYS_MAXSYSCALL },
 	{ "ibcs2",	ibcs2_syscallnames,	IBCS2_SYS_MAXSYSCALL },
 	{ "linux",	linux_syscallnames,	LINUX_SYS_MAXSYSCALL },
-	{ "osf1",	osf1_syscallnames,	OSF1_SYS_MAXSYSCALL },
 	{ "sunos",	sunos_syscallnames,	SUNOS_SYS_MAXSYSCALL },
 	{ "svr4",	svr4_syscallnames,	SVR4_SYS_MAXSYSCALL },
 	{ "bsdos",	bsdos_syscallnames,	BSDOS_SYS_MAXSYSCALL },
diff --git a/etc/etc.alpha/sysctl.conf b/etc/etc.alpha/sysctl.conf
index 03c2a118a53..5830d5f80a6 100644
--- a/etc/etc.alpha/sysctl.conf
+++ b/etc/etc.alpha/sysctl.conf
@@ -2,4 +2,3 @@
 #machdep.unaligned_fix=0	# 0 - disable fixup of unaligned access
 #machdep.unaligned_sigbus=0	# 0 - don't sigbus on unaligned access
 #machdep.allowaperture=1	# see xf86(4)
-#kern.emul.osf1=1		# enable running OSF/1 binaries
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index f48e49ceb13..0e3a7c4566c 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.198 2010/06/29 20:30:32 guenther Exp $
+.\"	$OpenBSD: options.4,v 1.199 2010/06/30 20:46:51 tedu Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: June 29 2010 $
+.Dd $Mdocdate: June 30 2010 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -138,16 +138,6 @@ and
 system calls which were replaced in
 .Ox 4.4
 when struct stat was expanded.
-.It Cd option COMPAT_OSF1
-On those architectures that support it, this enables binary
-compatibility with
-.Em Digital UNIX
-(formerly
-.Em OSF/1 )
-applications built for the same architecture.
-This option is available on the alpha architecture.
-See
-.Xr compat_osf1 8 .
 .It Cd option COMPAT_SUNOS
 On those architectures that support it, this enables binary
 compatibility with
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index a0e708189d0..90f1c1aa499 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.69 2010/06/29 20:30:31 guenther Exp $
+#	$OpenBSD: Makefile,v 1.70 2010/06/30 20:46:52 tedu Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 MAN=	afterboot.8 boot_config.8 compat_aout.8 compat_bsdos.8 \
 	compat_freebsd.8 compat_ibcs2.8 \
-	compat_linux.8 compat_osf1.8 compat_sunos.8 \
+	compat_linux.8 compat_sunos.8 \
 	compat_svr4.8 crash.8 daily.8 dhcp.8 \
 	diskless.8 genassym.sh.8 intro.8 netstart.8 rc.8 \
 	rc.conf.8 rc.shutdown.8 release.8 security.8 ssl.8 \
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 1b90a9cef42..9a28dd66a26 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kdump.c,v 1.43 2010/06/29 20:30:33 guenther Exp $	*/
+/*	$OpenBSD: kdump.c,v 1.44 2010/06/30 20:46:51 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -66,7 +66,6 @@ pid_t pid = -1;
 #include <compat/freebsd/freebsd_syscall.h>
 #include <compat/ibcs2/ibcs2_syscall.h>
 #include <compat/linux/linux_syscall.h>
-#include <compat/osf1/osf1_syscall.h>
 #include <compat/sunos/sunos_syscall.h>
 #include <compat/svr4/svr4_syscall.h>
 
@@ -85,7 +84,6 @@ pid_t pid = -1;
 #include <compat/freebsd/freebsd_syscalls.c>
 #include <compat/ibcs2/ibcs2_syscalls.c>
 #include <compat/linux/linux_syscalls.c>
-#include <compat/osf1/osf1_syscalls.c>
 #include <compat/sunos/sunos_syscalls.c>
 #include <compat/svr4/svr4_syscalls.c>
 #undef KTRACE
@@ -108,7 +106,6 @@ static struct emulation emulations[] = {
 	{ "native",	syscallnames,		SYS_MAXSYSCALL },
 	{ "ibcs2",	ibcs2_syscallnames,	IBCS2_SYS_MAXSYSCALL },
 	{ "linux",	linux_syscallnames,	LINUX_SYS_MAXSYSCALL },
-	{ "osf1",	osf1_syscallnames,	OSF1_SYS_MAXSYSCALL },
 	{ "sunos",	sunos_syscallnames,	SUNOS_SYS_MAXSYSCALL },
 	{ "svr4",	svr4_syscallnames,	SVR4_SYS_MAXSYSCALL },
 	{ "bsdos",	bsdos_syscallnames,	BSDOS_SYS_MAXSYSCALL },