another day, another compat gets removed. today is ibcs2's turn

7 files changed, 7 insertions, 202 deletions

diff --git a/bin/systrace/openbsd-syscalls.c b/bin/systrace/openbsd-syscalls.c
index 29b25d97333..6b8385130fa 100644
--- a/bin/systrace/openbsd-syscalls.c
+++ b/bin/systrace/openbsd-syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openbsd-syscalls.c,v 1.35 2010/06/30 20:46:51 tedu Exp $	*/
+/*	$OpenBSD: openbsd-syscalls.c,v 1.36 2010/07/01 17:26:52 tedu Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -35,7 +35,6 @@
 
 #include <compat/bsdos/bsdos_syscall.h>
 #include <compat/freebsd/freebsd_syscall.h>
-#include <compat/ibcs2/ibcs2_syscall.h>
 #include <compat/linux/linux_syscall.h>
 #include <compat/sunos/sunos_syscall.h>
 #include <compat/svr4/svr4_syscall.h>
@@ -53,7 +52,6 @@
 
 #include <compat/bsdos/bsdos_syscalls.c>
 #include <compat/freebsd/freebsd_syscalls.c>
-#include <compat/ibcs2/ibcs2_syscalls.c>
 #include <compat/linux/linux_syscalls.c>
 #include <compat/sunos/sunos_syscalls.c>
 #include <compat/svr4/svr4_syscalls.c>
@@ -90,7 +88,6 @@ struct emulation {
 static struct emulation emulations[] = {
 	{ "native",	syscallnames,		SYS_MAXSYSCALL },
 	{ "aout",	syscallnames,		SYS_MAXSYSCALL },
-	{ "ibcs2",	ibcs2_syscallnames,	IBCS2_SYS_MAXSYSCALL },
 	{ "linux",	linux_syscallnames,	LINUX_SYS_MAXSYSCALL },
 	{ "sunos",	sunos_syscallnames,	SUNOS_SYS_MAXSYSCALL },
 	{ "svr4",	svr4_syscallnames,	SVR4_SYS_MAXSYSCALL },
diff --git a/etc/etc.i386/sysctl.conf b/etc/etc.i386/sysctl.conf
index 61d93b0d7d2..d5e47c24a85 100644
--- a/etc/etc.i386/sysctl.conf
+++ b/etc/etc.i386/sysctl.conf
@@ -6,6 +6,5 @@
 #kern.emul.aout=1		# enable running dynamic OpenBSD a.out bins
 #kern.emul.bsdos=1		# enable running BSD/OS binaries
 #kern.emul.freebsd=1		# enable running FreeBSD binaries
-#kern.emul.ibcs2=1		# enable running iBCS2 binaries
 #kern.emul.linux=1		# enable running Linux binaries
 #kern.emul.svr4=1		# enable running SVR4 binaries
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 0e3a7c4566c..fdd5e6e2258 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.199 2010/06/30 20:46:51 tedu Exp $
+.\"	$OpenBSD: options.4,v 1.200 2010/07/01 17:26:52 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 30 2010 $
+.Dd $Mdocdate: July 1 2010 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -110,14 +110,6 @@ applications built for the same architecture.
 This option is available on the i386 architecture.
 See
 .Xr compat_freebsd 8 .
-.It Cd option COMPAT_IBCS2
-On those architectures that support it, this enables binary
-compatibility with
-.Em iBCS2
-applications built for the same architecture.
-This option is available on the i386 architecture.
-See
-.Xr compat_ibcs2 8 .
 .It Cd option COMPAT_LINUX
 On those architectures that support it, this enables binary
 compatibility with
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 7e0516f1cd4..f1d96601ba8 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.81 2010/07/01 00:07:13 tedu Exp $
+.\"	$OpenBSD: hier.7,v 1.82 2010/07/01 17:26:52 tedu Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -81,7 +81,6 @@ and the system compat pages:
 .Xr compat_aout 8 ,
 .Xr compat_bsdos 8 ,
 .Xr compat_freebsd 8 ,
-.Xr compat_ibcs2 8 ,
 .Xr compat_linux 8 ,
 .Xr compat_sunos 8 ,
 and
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 90f1c1aa499..4c4cf0ac79a 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.70 2010/06/30 20:46:52 tedu Exp $
+#	$OpenBSD: Makefile,v 1.71 2010/07/01 17:26: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_freebsd.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 \
diff --git a/share/man/man8/compat_ibcs2.8 b/share/man/man8/compat_ibcs2.8
deleted file mode 100644
index b4695fc1ee0..00000000000
--- a/share/man/man8/compat_ibcs2.8
+++ /dev/null
@@ -1,179 +0,0 @@
-.\"	$OpenBSD: compat_ibcs2.8,v 1.17 2007/05/31 19:19:58 jmc Exp $
-.\"
-.\" Copyright (c) 1998 Scott Bartram
-.\" Copyright (c) 1995 Frank van der Linden
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed for the NetBSD Project
-.\"      by Scott Bartram and Frank van der Linden
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" Based on compat_linux.8
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt COMPAT_IBCS2 8
-.Os
-.Sh NAME
-.Nm compat_ibcs2
-.Nd setup for running iBCS2 binaries under emulation
-.Sh DESCRIPTION
-.Ox
-supports running Intel Binary Compatibility Standard 2 (iBCS2)
-binaries.
-This only applies to i386 systems for now.
-Binaries are supported from SCO UNIX and other systems derived from UNIX
-System V Release 3.
-iBCS2 support is only well tested using SCO binaries.
-XENIX binaries are also supported although not as well tested.
-This option is controlled by the kern.emul.ibcs2
-.Xr sysctl 8 .
-SVR4 binaries are supported by the
-.Nm COMPAT_SVR4
-option.
-.Pp
-iBCS2 supports COFF, ELF, and x.out (XENIX) binary formats.
-Binaries from SCO OpenServer (version 5.x) are the only ELF binaries
-that have been tested.
-Most programs should work, but not ones that use or depend on:
-.Pp
-.Bl -tag -width 123 -compact -offset indent
-.It kernel internal data structures
-.It STREAMS drivers (other than TCP/IP sockets)
-.It local X displays (uses a STREAMS pipe)
-.It virtual 8086 mode
-.El
-.Pp
-The iBCS2 compatibility feature is active for kernels compiled with
-the
-.Nm COMPAT_IBCS2
-option enabled.
-If support for iBCS2 ELF executables is desired,
-the
-.Nm EXEC_ELF32
-option should be enabled in addition to
-.Nm COMPAT_IBCS2 .
-.Pp
-Many COFF-format programs and most ELF-format programs are dynamically
-linked.
-This means that the shared libraries that the program
-depends on will also be needed.
-Also, a "shadow root" directory for iBCS2 binaries
-on the
-.Ox
-system will have to be created.
-This directory is named
-.Pa /emul/ibcs2 .
-Any file operations done by iBCS2 programs run
-under
-.Ox
-will look in this directory first.
-So, if an iBCS2 program opens, for example,
-.Pa /etc/passwd ,
-.Ox
-will first try to open
-.Pa /emul/ibcs2/etc/passwd ,
-and if that does not exist open the `real'
-.Pa /etc/passwd
-file.
-It is recommended that iBCS2 packages that include
-configuration files, etc., be installed under
-.Pa /emul/ibcs2 ,
-to avoid naming conflicts with possible
-.Ox
-counterparts.
-Shared libraries should also be installed in the shadow tree.
-.Pp
-Generally, it will only be necessary to look for the shared libraries that
-iBCS2 binaries depend on the first few times
-iBCS2 programs are installed on the
-.Ox
-system.
-After a while, there will be a sufficient set of iBCS2 shared libraries
-on the system to be able to run newly imported iBCS2 binaries without
-any extra work.
-.Ss Setting up shared libraries
-How to get to know which shared libraries iBCS2 binaries need, and
-where to get them?
-Depending on the file type of the executable, there are different
-possibilities.
-(When following these instructions, root privileges are required
-on the
-.Ox
-system to perform the necessary installation steps).
-.Bl -tag -width 123
-.It 1. COFF binaries
-Simply copy all of the available shared libraries since they
-are fairly small in size.
-The COFF shared libraries are typically found in
-.Pa /shlib
-and can be obtained from the following sources:
-.Bd -unfilled -offset indent
-SCO UNIX version 3.x (aka ODT)
-SCO UNIX version 5.x (aka OpenServer)
-SCO UnixWare
-Many versions of SVR4.2/x86
-.Ed
-.Pp
-After copying the shared libraries, the following files should be
-present on the
-.Ox
-system:
-.Bd -unfilled -offset indent
-/emul/ibcs2/shlib/libc_s
-/emul/ibcs2/shlib/libnsl_s
-/emul/ibcs2/shlib/protlib_s
-.Ed
-.It 2. ELF binaries
-Copy all of the available shared libraries from the
-source system or distribution, or use the `ldd-elf' program (in
-development) to determine the libraries required by a specific binary.
-.Pp
-After copying the shared libraries, the following files should be
-present on the
-.Ox
-system:
-.Bd -unfilled -offset indent
-/emul/ibcs2/usr/lib/libc.so.1
-/emul/ibcs2/usr/lib/libcrypt.so
-/emul/ibcs2/usr/lib/libndbm.so
-/emul/ibcs2/usr/lib/libsocket.so.1
-.Ed
-.El
-.Pp
-If access to an SCO system is impossible, the extra files will need to be
-obtained from an SCO distribution.
-As of January 1998, SCO sells a copy of SCO OpenServer (iBCS2) and/or
-SCO UnixWare (SVR4) for personal/non-commercial use for only the cost
-of shipping (about $20US).
-The distribution comes on an ISO 9660-format CD-ROM which can be mounted
-and used to copy the necessary files.
-.Sh BUGS
-The information about SCO distributions may become outdated.
-.Pp
-Attempting to use a nameserver on the local host does not currently
-work due to an absurd shortcut taken by the iBCS2 network code
-(remember that there are no kernel sockets).
-.Pp
-16/32/64 bit offsets may not be handled correctly in all cases.
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 9a28dd66a26..2523f1da1e1 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kdump.c,v 1.44 2010/06/30 20:46:51 tedu Exp $	*/
+/*	$OpenBSD: kdump.c,v 1.45 2010/07/01 17:26:52 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -64,7 +64,6 @@ pid_t pid = -1;
 
 #include <compat/bsdos/bsdos_syscall.h>
 #include <compat/freebsd/freebsd_syscall.h>
-#include <compat/ibcs2/ibcs2_syscall.h>
 #include <compat/linux/linux_syscall.h>
 #include <compat/sunos/sunos_syscall.h>
 #include <compat/svr4/svr4_syscall.h>
@@ -82,7 +81,6 @@ pid_t pid = -1;
 
 #include <compat/bsdos/bsdos_syscalls.c>
 #include <compat/freebsd/freebsd_syscalls.c>
-#include <compat/ibcs2/ibcs2_syscalls.c>
 #include <compat/linux/linux_syscalls.c>
 #include <compat/sunos/sunos_syscalls.c>
 #include <compat/svr4/svr4_syscalls.c>
@@ -104,7 +102,6 @@ struct emulation {
 
 static struct emulation emulations[] = {
 	{ "native",	syscallnames,		SYS_MAXSYSCALL },
-	{ "ibcs2",	ibcs2_syscallnames,	IBCS2_SYS_MAXSYSCALL },
 	{ "linux",	linux_syscallnames,	LINUX_SYS_MAXSYSCALL },
 	{ "sunos",	sunos_syscallnames,	SUNOS_SYS_MAXSYSCALL },
 	{ "svr4",	svr4_syscallnames,	SVR4_SYS_MAXSYSCALL },