diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2010-06-30 20:38:51 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2010-06-30 20:38:51 +0000 |
| commit | 9f41651cc302b19305f81c1b12632cbe3d4dd018 (patch) | |
| tree | 438fd051fff35b9b472043809f45fe056ef33afb /sys/kern | |
| parent | 7dede52ed7ea0cabc0fa13a02c23e23d4db9fb48 (diff) | |
remove compat_osf1 support from the kernel
ok deraadt miod
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/Makefile | 4 | ||||
| -rw-r--r-- | sys/kern/exec_conf.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/kern/Makefile b/sys/kern/Makefile index 6a180271f08..49ceed5661e 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/06/29 20:30:33 guenther Exp $ +# $OpenBSD: Makefile,v 1.23 2010/06/30 20:38:49 tedu Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -31,7 +31,7 @@ SYSDIR=/sys # Directories in which to place tags links (other than machine-dependent) DGEN= compat compat/common compat/freebsd compat/ibcs2 \ - compat/linux compat/osf1 compat/sunos compat/svr4 \ + compat/linux compat/sunos compat/svr4 \ conf \ ddb \ dev dev/eisa dev/ic dev/isa dev/pci dev/pcmcia dev/cardbus \ diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index 2c17a7a4b3f..e3dc15045ca 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.21 2010/06/29 20:30:33 guenther Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.22 2010/06/30 20:38:49 tedu Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -74,7 +74,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_osf1, emul_sunos, emul_svr4; + emul_sunos, emul_svr4; struct execsw execsw[] = { { EXEC_SCRIPT_HDRSZ, exec_script_makecmds, &emul_native, }, /* shell scripts */ @@ -93,9 +93,6 @@ struct execsw execsw[] = { #endif #ifdef _KERN_DO_ELF64 { sizeof(Elf64_Ehdr), exec_elf64_makecmds, &emul_native }, /* elf binaries */ -#ifdef COMPAT_OSF1 - { sizeof(Elf64_Ehdr), exec_elf64_makecmds, &emul_osf1 }, -#endif #endif /* ELF64 */ #ifdef COMPAT_LINUX { LINUX_AOUT_HDR_SIZE, exec_linux_aout_makecmds, &emul_linux_aout }, /* linux a.out */ |