diff options
| -rw-r--r-- | sys/arch/vax/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/vax/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/vax/conf/files.vax | 3 | ||||
| -rw-r--r-- | sys/arch/vax/vax/locore.S | 20 | ||||
| -rw-r--r-- | sys/arch/vax/vax/machdep.c | 6 | ||||
| -rw-r--r-- | sys/kern/Makefile | 4 | ||||
| -rw-r--r-- | sys/kern/exec_conf.c | 7 |
7 files changed, 9 insertions, 43 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 3b92f268345..a95844efbb6 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.51 2008/12/21 21:38:16 miod Exp $ +# $OpenBSD: GENERIC,v 1.52 2010/06/29 18:46:34 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -34,12 +34,8 @@ option VAX60 # VS 3[58][24]0 option VXT # VXT2000 and VXT2000+ # Old compat stuff; needed to run 4.3BSD Reno programs. -# Note that if COMPAT_ULTRIX is set, you lose compatibility with -# 4.3BSD Reno programs and get Ultrix compatibility instead. -# (They cannot coexist). option COMPAT_VAX1K # Must be present to run old (< 3.1) binaries. option COMPAT_35 # needed for COMPAT_VAX1K -#option COMPAT_ULTRIX option INSN_EMULATE # CPU lacks some hardware instructions. diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index f5f08986929..209f5ff40aa 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.31 2008/08/20 19:00:01 miod Exp $ +# $OpenBSD: RAMDISK,v 1.32 2010/06/29 18:46:34 tedu Exp $ machine vax # machine type @@ -43,11 +43,7 @@ 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. -# Note that if COMPAT_ULTRIX is set, you lose compatibility with -# 4.3BSD Reno programs and get Ultrix compatibility instead. -# (They cannot coexist). #option COMPAT_VAX1K # Must be present to run pre-1.4 binaries. -#option COMPAT_ULTRIX option INSN_EMULATE # CPU lacks some hardware instructions. diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index f9f517e2452..49367ceacf6 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $OpenBSD: files.vax,v 1.51 2010/05/26 16:35:27 deraadt Exp $ +# $OpenBSD: files.vax,v 1.52 2010/06/29 18:46:34 tedu Exp $ # $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $ # # new style config file for vax architecture @@ -400,7 +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/ultrix/files.ultrix" include "compat/vax1k/files.vax1k" # Keep these for now. Time will tell which we will need... diff --git a/sys/arch/vax/vax/locore.S b/sys/arch/vax/vax/locore.S index 0dfd5daa96a..84cdfb5fa2b 100644 --- a/sys/arch/vax/vax/locore.S +++ b/sys/arch/vax/vax/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.2 2010/05/29 14:08:22 deraadt Exp $ */ +/* $OpenBSD: locore.S,v 1.3 2010/06/29 18:46:34 tedu Exp $ */ /* $NetBSD: intvec.s,v 1.39 1999/06/28 08:20:48 itojun Exp $ */ /* @@ -40,10 +40,6 @@ #define JSBENTRY(x) \ .text; _ALIGN_TEXT; .globl x; x: -#ifdef COMPAT_ULTRIX -#include <compat/ultrix/ultrix_syscall.h> -#endif - #define TRAPCALL(namn, typ) \ JSBENTRY(namn) ; \ pushl $0 ; \ @@ -483,20 +479,6 @@ _sigcode: .align 2 _esigcode: -#ifdef COMPAT_ULTRIX - .globl _ultrix_sigcode,_ultrix_esigcode -_ultrix_sigcode: pushr $0x3f - subl2 $0xc,sp - movl 0x24(sp),r0 - calls $3,(r0) - popr $0x3f - chmk $ULTRIX_SYS_sigreturn - chmk $SYS_exit - halt - .align 2 -_ultrix_esigcode: -#endif - .globl _idsptch, _eidsptch _idsptch: pushr $0x3f .word 0x9f16 # jsb to absolute address diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index d88676cb186..5e50eefaceb 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.109 2010/06/27 12:41:23 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.110 2010/06/29 18:46:34 tedu Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -510,10 +510,6 @@ sendsig(catcher, sig, mask, code, type, val) gsigf.sf_sc.sc_r[10] = syscf->r10; gsigf.sf_sc.sc_r[11] = syscf->r11; -#if defined(COMPAT_ULTRIX) - native_sigset_to_sigset13(mask, &gsigf.sf_sc.__sc_mask13); -#endif - if (copyout(&gsigf, sigf, sizeof(gsigf))) sigexit(p, SIGILL); diff --git a/sys/kern/Makefile b/sys/kern/Makefile index ceab3322f8f..822297a0120 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/06/01 23:14:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2010/06/29 18:46:34 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/hpux compat/ibcs2 \ - compat/linux compat/osf1 compat/sunos compat/svr4 compat/ultrix \ + compat/linux compat/osf1 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 8c86a3303a3..b883b6d5028 100644 --- a/sys/kern/exec_conf.c +++ b/sys/kern/exec_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_conf.c,v 1.19 2008/09/19 05:41:29 djm Exp $ */ +/* $OpenBSD: exec_conf.c,v 1.20 2010/06/29 18:46:34 tedu Exp $ */ /* $NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $ */ /* @@ -78,7 +78,7 @@ extern struct emul emul_native, emul_elf32, emul_elf64, emul_aout, emul_bsdos, emul_freebsd_aout, emul_freebsd_elf, emul_hpux, emul_ibcs2, emul_linux_elf, emul_linux_aout, emul_netbsd_elf64, - emul_osf1, emul_sunos, emul_svr4, emul_ultrix; + emul_osf1, emul_sunos, emul_svr4; struct execsw execsw[] = { { EXEC_SCRIPT_HDRSZ, exec_script_makecmds, &emul_native, }, /* shell scripts */ @@ -125,9 +125,6 @@ struct execsw execsw[] = { #ifdef COMPAT_VAX1K { sizeof(struct exec), exec_vax1k_makecmds, &emul_native }, /* vax1k a.out */ #endif -#ifdef COMPAT_ULTRIX - { ECOFF_HDR_SIZE, exec_ecoff_makecmds, &emul_ultrix }, /* ecoff binaries */ -#endif #ifdef COMPAT_SVR4 { sizeof(Elf32_Ehdr), exec_elf32_makecmds, &emul_svr4 }, /* elf binaries */ #endif |