summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/conf/GENERIC4
-rw-r--r--sys/arch/sparc/conf/RAMDISK4
-rw-r--r--sys/arch/sparc/conf/SUN43
-rw-r--r--sys/arch/sparc/conf/SUN4C3
-rw-r--r--sys/arch/sparc/conf/SUN4M3
-rw-r--r--sys/arch/sparc/conf/files.sparc6
-rw-r--r--sys/arch/sparc/dev/fd.c5
-rw-r--r--sys/arch/sparc/include/exec.h8
-rw-r--r--sys/arch/sparc/sparc/machdep.c42
9 files changed, 14 insertions, 64 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index ede231f7010..101281389fc 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.95 2010/06/07 19:54:32 miod Exp $
+# $OpenBSD: GENERIC,v 1.96 2010/07/02 19:57:14 tedu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -25,8 +25,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc.
#option KGDBDEV=0xc01 # kgdb device number (dev_t)
#option KGDBRATE=38400 # baud rate
-# Options for SPARCstation hardware
-option COMPAT_SUNOS # compatibility with SunOS binaries
option COMPAT_SVR4 # compatibility with SVR4 binaries
option PROCFS # /proc
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index cac3a844612..708c32f09cd 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.68 2010/06/07 20:46:21 miod Exp $
+# $OpenBSD: RAMDISK,v 1.69 2010/07/02 19:57:15 tedu Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -38,8 +38,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc.
#option KGDBDEV=0xc01 # kgdb device number (dev_t)
#option KGDBRATE=38400 # baud rate
-# Options for SPARCstation hardware
-#option COMPAT_SUNOS # compatibility with SunOS binaries
#option COMPAT_SVR4 # compatibility with SVR4 binaries
option WSEMUL_SUN # provide sun terminal emulation; required
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index 38d94aa474d..9dad08c15dc 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4,v 1.37 2010/06/07 19:54:32 miod Exp $
+# $OpenBSD: SUN4,v 1.38 2010/07/02 19:57:15 tedu Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -11,7 +11,6 @@ option SUN4 # sun4/100, sun4/200, sun4/300
#option MMU_3L # 3-level MMU on sun4/400
# Options for SPARCstation hardware
-option COMPAT_SUNOS # compatibility with SunOS binaries
option COMPAT_SVR4 # compatibility with SVR4 binaries
option PROCFS # /proc
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 52526975cfe..de472ba8d54 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4C,v 1.60 2009/06/24 11:38:40 deraadt Exp $
+# $OpenBSD: SUN4C,v 1.61 2010/07/02 19:57:15 tedu Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -14,7 +14,6 @@ option SUN4C # sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc.
#option KGDBRATE=38400 # baud rate
# Options for SPARCstation hardware
-option COMPAT_SUNOS # compatibility with SunOS binaries
option COMPAT_SVR4 # compatibility with SVR4 binaries
option PROCFS # /proc
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 5e3de103eee..aab337b883e 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4M,v 1.76 2009/07/13 19:53:58 kettenis Exp $
+# $OpenBSD: SUN4M,v 1.77 2010/07/02 19:57:15 tedu Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -16,7 +16,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc.
#option KGDBRATE=38400 # baud rate
# Options for SPARCstation hardware
-option COMPAT_SUNOS # compatibility with SunOS binaries
option COMPAT_SVR4 # compatibility with SVR4 binaries
option PROCFS # /proc
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 272f90a4968..ccf59e46d6f 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc,v 1.85 2009/08/29 21:30:48 kettenis Exp $
+# $OpenBSD: files.sparc,v 1.86 2010/07/02 19:57:15 tedu Exp $
# $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
@@ -313,10 +313,6 @@ file arch/sparc/sparc/db_disasm.c ddb
# SVR4 Binary Compatibility (COMPAT_SVR4)
include "../../../compat/svr4/files.svr4"
file arch/sparc/sparc/svr4_machdep.c compat_svr4
-file arch/sparc/sparc/sunos_machdep.c compat_sunos
-
-# SunOS Binary Compatibility (COMPAT_SUNOS)
-include "../../../compat/sunos/files.sunos"
# Magma Serial/Parallel boards
device magma {}
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 6e3b8214e25..c90be332be7 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.70 2010/05/23 10:49:19 dlg Exp $ */
+/* $OpenBSD: fd.c,v 1.71 2010/07/02 19:57:15 tedu Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -1795,9 +1795,6 @@ fdioctl(dev, cmd, addr, flag, p)
if (((struct mtop *)addr)->mt_op != MTOFFL)
return EIO;
-#ifdef COMPAT_SUNOS
- case SUNOS_FDIOCEJECT:
-#endif
case DIOCEJECT:
fd_do_eject(fd);
return (0);
diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h
index 0bfa97b9a1c..a533892c5c7 100644
--- a/sys/arch/sparc/include/exec.h
+++ b/sys/arch/sparc/include/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.12 2010/06/27 03:11:44 guenther Exp $ */
+/* $OpenBSD: exec.h,v 1.13 2010/07/02 19:57:15 tedu Exp $ */
/* $NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */
/*
@@ -126,9 +126,9 @@ struct relocation_info_sparc {
#define _NLIST_DO_AOUT
#define _NLIST_DO_ELF
-#ifdef COMPAT_SUNOS
-#define _KERN_DO_AOUT
-#endif
+#define cpu_exec_aout_makecmds(p, epp) (ENOEXEC)
+
+
#define _KERN_DO_ELF
#endif /* _SPARC_EXEC_H_ */
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 356e18ee2fa..dd9e3421c42 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.129 2010/07/02 04:14:19 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.130 2010/07/02 19:57:15 tedu Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -312,11 +312,7 @@ int sigpid = 0;
struct sigframe {
int sf_signo; /* signal number */
siginfo_t *sf_sip; /* points to siginfo_t */
-#ifdef COMPAT_SUNOS
- struct sigcontext *sf_scp; /* points to user addr of sigcontext */
-#else
int sf_xxx; /* placeholder */
-#endif
caddr_t sf_addr; /* SunOS compat */
struct sigcontext sf_sc; /* actual sigcontext */
siginfo_t sf_si;
@@ -399,9 +395,6 @@ sendsig(catcher, sig, mask, code, type, val)
struct trapframe *tf;
int caddr, oonstack, oldsp, newsp;
struct sigframe sf;
-#ifdef COMPAT_SUNOS
- extern struct emul emul_sunos;
-#endif
tf = p->p_md.md_tf;
oldsp = tf->tf_out[6];
@@ -431,13 +424,6 @@ sendsig(catcher, sig, mask, code, type, val)
*/
sf.sf_signo = sig;
sf.sf_sip = NULL;
-#ifdef COMPAT_SUNOS
- if (p->p_emul == &emul_sunos) {
- sf.sf_sip = (void *)code; /* SunOS has "int code" */
- sf.sf_scp = &fp->sf_sc;
- sf.sf_addr = val.sival_ptr;
- }
-#endif
/*
* Build the signal context to be used by sigreturn.
@@ -491,15 +477,8 @@ sendsig(catcher, sig, mask, code, type, val)
* Arrange to continue execution at the code copied out in exec().
* It needs the function to call in %g1, and a new stack pointer.
*/
-#ifdef COMPAT_SUNOS
- if (psp->ps_usertramp & sigmask(sig)) {
- caddr = (int)catcher; /* user does his own trampolining */
- } else
-#endif
- {
- caddr = p->p_sigcode;
- tf->tf_global[1] = (int)catcher;
- }
+ caddr = p->p_sigcode;
+ tf->tf_global[1] = (int)catcher;
tf->tf_pc = caddr;
tf->tf_npc = caddr + 4;
tf->tf_out[6] = newsp;
@@ -888,21 +867,6 @@ mapdev(phys, virt, offset, size)
return (ret);
}
-#ifdef COMPAT_SUNOS
-int
-cpu_exec_aout_makecmds(p, epp)
- struct proc *p;
- struct exec_package *epp;
-{
- int error = ENOEXEC;
-
- extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *);
- if ((error = sunos_exec_aout_makecmds(p, epp)) == 0)
- return 0;
- return error;
-}
-#endif
-
#ifdef SUN4
void
oldmon_w_trace(va)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 09:41:50 +0000