diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-27 03:27:08 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-27 03:27:08 +0000 |
| commit | 0e2dec7808332fbf49fc5513c5d883ccb99def0d (patch) | |
| tree | 0cf06c724ed3d71f4812bd10d1cb8596f5329f3f | |
| parent | 49de6f8d6227a3cb7c733fb2b7ab574fab991912 (diff) | |
remove compat_vax1k. no more 4.3bsd reno support. ok deraadt
| -rw-r--r-- | sys/arch/vax/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/vax/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/vax/conf/files.vax | 4 | ||||
| -rw-r--r-- | sys/kern/exec_conf.c | 9 |
4 files changed, 4 insertions, 20 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 0d96e7b7ef6..7461b7fbdf0 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.53 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: GENERIC,v 1.54 2011/06/27 03:27:07 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -33,10 +33,6 @@ option VAX53 # VAX 4000 10X, MicroVAX 3100m9X option VAX60 # VS 3[58][24]0 option VXT # VXT2000 and VXT2000+ -# Old compat stuff; needed to run 4.3BSD Reno programs. -option COMPAT_VAX1K # Must be present to run old (< 3.1) binaries. -option COMPAT_35 # needed for COMPAT_VAX1K - option INSN_EMULATE # CPU lacks some hardware instructions. config bsd swap generic diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 46f2b995565..71f87ff9375 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.33 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: RAMDISK,v 1.34 2011/06/27 03:27:07 tedu Exp $ machine vax # machine type @@ -42,9 +42,6 @@ option BOOT_CONFIG # boot-time kernel config config bsd root on rd0a swap on rd0b # and sd0b -# Old compat stuff; needed to run 4.3BSD Reno programs. -#option COMPAT_VAX1K # Must be present to run pre-1.4 binaries. - option INSN_EMULATE # CPU lacks some hardware instructions. mainbus0 at root diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index 49367ceacf6..3312704cfa6 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $OpenBSD: files.vax,v 1.52 2010/06/29 18:46:34 tedu Exp $ +# $OpenBSD: files.vax,v 1.53 2011/06/27 03:27:07 tedu Exp $ # $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $ # # new style config file for vax architecture @@ -400,8 +400,6 @@ file arch/vax/vax/vxt.c vxt file arch/vax/vax/wscons_machdep.c wsdisplay | wskbd file arch/vax/uba/uba_dma.c uba -include "compat/vax1k/files.vax1k" - # Keep these for now. Time will tell which we will need... #arch/vax/vax/dkbad.c standard #arch/vax/vax/ka730.c standard diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c index 9d67af0d89a..edcd052aa15 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.26 2011/04/05 12:50:15 guenther Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.27 2011/06/27 03:27:07 tedu Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -51,10 +51,6 @@ #include <compat/linux/linux_exec.h> #endif -#ifdef COMPAT_VAX1K -#include <compat/vax1k/vax1k_exec.h> -#endif - extern struct emul emul_native, emul_elf32, emul_elf64, emul_aout, emul_freebsd_aout, emul_freebsd_elf, emul_linux_elf, emul_linux_aout, emul_netbsd_elf64, @@ -82,9 +78,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_VAX1K - { sizeof(struct exec), exec_vax1k_makecmds, &emul_native }, /* vax1k a.out */ -#endif #ifdef COMPAT_SVR4 { sizeof(Elf32_Ehdr), exec_elf32_makecmds, &emul_svr4 }, /* elf binaries */ #endif |