diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2010-07-01 17:30:28 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2010-07-01 17:30:28 +0000 |
| commit | 4646324bc1a558653bb05db5bbe3331c4fe2ad5a (patch) | |
| tree | 5370db8b780fe54a9f75926ffc4638526b96a4cd /sys/kern | |
| parent | ba335bb2458fc1d80b37022a1a2d334f8f2c82be (diff) | |
another day, another compat gets removed. today is ibcs2's turn
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/Makefile | 4 | ||||
| -rw-r--r-- | sys/kern/exec_conf.c | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/kern/Makefile b/sys/kern/Makefile index 49ceed5661e..5c22814b01f 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/06/30 20:38:49 tedu Exp $ +# $OpenBSD: Makefile,v 1.24 2010/07/01 17:30:25 tedu Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -30,7 +30,7 @@ SYSTAGS=/var/db/sys_tags SYSDIR=/sys # Directories in which to place tags links (other than machine-dependent) -DGEN= compat compat/common compat/freebsd compat/ibcs2 \ +DGEN= compat compat/common compat/freebsd \ compat/linux compat/sunos compat/svr4 \ conf \ ddb \ diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index e3dc15045ca..81215d52e18 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.22 2010/06/30 20:38:49 tedu Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.23 2010/07/01 17:30:25 tedu Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -47,10 +47,6 @@ #include <compat/svr4/svr4_exec.h> #endif -#ifdef COMPAT_IBCS2 -#include <compat/ibcs2/ibcs2_exec.h> -#endif - #ifdef COMPAT_LINUX #include <compat/linux/linux_exec.h> #endif @@ -73,7 +69,7 @@ extern struct emul emul_native, emul_elf32, emul_elf64, emul_aout, emul_bsdos, emul_freebsd_aout, emul_freebsd_elf, - emul_ibcs2, emul_linux_elf, emul_linux_aout, emul_netbsd_elf64, + emul_linux_elf, emul_linux_aout, emul_netbsd_elf64, emul_sunos, emul_svr4; struct execsw execsw[] = { @@ -98,10 +94,6 @@ struct execsw execsw[] = { { LINUX_AOUT_HDR_SIZE, exec_linux_aout_makecmds, &emul_linux_aout }, /* linux a.out */ { sizeof(Elf32_Ehdr), exec_linux_elf32_makecmds, &emul_linux_elf }, #endif -#ifdef COMPAT_IBCS2 - { COFF_HDR_SIZE, exec_ibcs2_coff_makecmds, &emul_ibcs2 }, /* coff binaries */ - { XOUT_HDR_SIZE, exec_ibcs2_xout_makecmds, &emul_ibcs2 }, /* x.out binaries */ -#endif #ifdef COMPAT_BSDOS { BSDOS_AOUT_HDR_SIZE, exec_bsdos_aout_makecmds, &emul_bsdos }, /* bsdos */ #endif |