Deorbit COMPAT_SUNOS.

We inherited this from the sparc32 port of BSD4.4-Lite1.  We have neither
a sparc32 port nor a SunOS4.x compatibility desire these days.

11 files changed, 34 insertions, 46 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 0f2dbad..e684efd 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -978,7 +978,7 @@ close(td, uap)
 	return (error);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Return status information about a file descriptor.
  */
@@ -1015,7 +1015,7 @@ ofstat(td, uap)
 done2:
 	return (error);
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Return status information about a file descriptor.
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index d30a94b..ab2ae0a 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -84,7 +84,7 @@ getpid(struct thread *td, struct getpid_args *uap)
 	struct proc *p = td->td_proc;
 
 	td->td_retval[0] = p->p_pid;
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 	PROC_LOCK(p);
 	td->td_retval[1] = p->p_pptr->p_pid;
 	PROC_UNLOCK(p);
@@ -216,7 +216,7 @@ getuid(struct thread *td, struct getuid_args *uap)
 {
 
 	td->td_retval[0] = td->td_ucred->cr_ruid;
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 	td->td_retval[1] = td->td_ucred->cr_uid;
 #endif
 	return (0);
@@ -253,7 +253,7 @@ getgid(struct thread *td, struct getgid_args *uap)
 {
 
 	td->td_retval[0] = td->td_ucred->cr_rgid;
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 	td->td_retval[1] = td->td_ucred->cr_groups[0];
 #endif
 	return (0);
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index a172644..dd9ad4d 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -474,7 +474,7 @@ pri_to_rtp(struct ksegrp *kg, struct rtprio *rtp)
 	rtp->type = kg->kg_pri_class;
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #ifndef _SYS_SYSPROTO_H_
 struct osetrlimit_args {
 	u_int	which;
@@ -541,7 +541,7 @@ ogetrlimit(td, uap)
 	error = copyout(&olim, uap->rlp, sizeof(olim));
 	return (error);
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 #ifndef _SYS_SYSPROTO_H_
 struct __setrlimit_args {
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 81f5bbb..e3466a9 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -235,7 +235,7 @@ sigonstack(size_t sp)
 	struct thread *td = curthread;
 
 	return ((td->td_pflags & TDP_ALTSTACK) ?
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 	    ((td->td_sigstk.ss_size == 0) ?
 		(td->td_sigstk.ss_flags & SS_ONSTACK) :
 		((sp - (size_t)td->td_sigstk.ss_sp) < td->td_sigstk.ss_size))
@@ -347,12 +347,6 @@ kern_sigaction(td, sig, act, oact, flags)
 			SIGADDSET(ps->ps_signodefer, sig);
 		else
 			SIGDELSET(ps->ps_signodefer, sig);
-#ifdef COMPAT_SUNOS
-		if (act->sa_flags & SA_USERTRAMP)
-			SIGADDSET(ps->ps_usertramp, sig);
-		else
-			SIGDELSET(ps->ps_usertramp, sig);
-#endif
 		if (sig == SIGCHLD) {
 			if (act->sa_flags & SA_NOCLDSTOP)
 				ps->ps_flag |= PS_NOCLDSTOP;
@@ -1000,7 +994,7 @@ osigpending(td, uap)
 }
 #endif /* COMPAT_43 */
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Generalized interface signal handler, 4.3-compatible.
  */
@@ -1037,9 +1031,6 @@ osigvec(td, uap)
 		OSIG2SIG(vec.sv_mask, nsap->sa_mask);
 		nsap->sa_flags = vec.sv_flags;
 		nsap->sa_flags ^= SA_RESTART;	/* opposite of SV_INTERRUPT */
-#ifdef COMPAT_SUNOS
-		nsap->sa_flags |= SA_USERTRAMP;
-#endif
 	}
 	error = kern_sigaction(td, uap->signum, nsap, osap, KSA_OSIGSET);
 	if (osap && !error) {
@@ -1048,9 +1039,6 @@ osigvec(td, uap)
 		vec.sv_flags = osap->sa_flags;
 		vec.sv_flags &= ~SA_NOCLDWAIT;
 		vec.sv_flags ^= SA_RESTART;
-#ifdef COMPAT_SUNOS
-		vec.sv_flags &= ~SA_NOCLDSTOP;
-#endif
 		error = copyout(&vec, uap->osv, sizeof(vec));
 	}
 	return (error);
@@ -1106,7 +1094,7 @@ osigsetmask(td, uap)
 	PROC_UNLOCK(p);
 	return (0);
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Suspend process until signal, providing mask to be set
@@ -1200,7 +1188,7 @@ osigsuspend(td, uap)
 }
 #endif /* COMPAT_43 */
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #ifndef _SYS_SYSPROTO_H_
 struct osigstack_args {
 	struct	sigstack *nss;
@@ -1237,7 +1225,7 @@ osigstack(td, uap)
 
 	return (error);
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 #ifndef _SYS_SYSPROTO_H_
 struct sigaltstack_args {
@@ -1416,7 +1404,7 @@ kill(td, uap)
 	/* NOTREACHED */
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #ifndef _SYS_SYSPROTO_H_
 struct okillpg_args {
 	int	pgid;
@@ -1437,7 +1425,7 @@ okillpg(td, uap)
 		return (EINVAL);
 	return (killpg1(td, uap->signum, uap->pgid, 0));
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Send a signal to a process group.
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index d112fa9..f52dd98 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/utsname.h>
 
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 
 #ifndef _SYS_SYSPROTO_H_
 struct gethostname_args {
@@ -121,7 +121,7 @@ ogethostid(td, uap)
 	*(long *)(td->td_retval) = hostid;
 	return (0);
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 #ifdef COMPAT_43
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index f81186f..aeecbb8 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/sx.h>
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #include <sys/ioctl_compat.h>
 #endif
 #include <sys/proc.h>
@@ -769,7 +769,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag)
 	case  TIOCSTI:
 	case  TIOCSTOP:
 	case  TIOCSWINSZ:
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 	case  TIOCLBIC:
 	case  TIOCLBIS:
 	case  TIOCLSET:
@@ -1130,7 +1130,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag)
 		*(int *)data = tp->t_timeout / hz;
 		break;
 	default:
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 		return (ttcompat(tp, cmd, data, flag));
 #else
 		return (ENOIOCTL);
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 53db787..1cd0dd1 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 /*
  * mapping routines for old line discipline (yuck)
  */
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -485,4 +485,4 @@ ttcompatsetlflags(tp, t)
 	t->c_lflag = lflag;
 	t->c_cflag = cflag;
 }
-#endif	/* COMPAT_43 || COMPAT_SUNOS */
+#endif	/* COMPAT_43 */
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 85511c9..96ccbf4 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #include <sys/ioctl_compat.h>
 #endif
 #include <sys/proc.h>
@@ -738,7 +738,7 @@ ptyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 		case TIOCSETP:
 		case TIOCSETN:
 #endif
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 		case TIOCSETC:
 		case TIOCSLTC:
 		case TIOCLBIS:
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index cce7396..9ea94f4 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -103,7 +103,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0,
 /*
  * System call interface to the socket abstraction.
  */
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 #define COMPAT_OLDSOCK
 #endif
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 3ce9c98..50ab8ed 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1733,7 +1733,7 @@ lseek(td, uap)
 	return (0);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Reposition read/write file offset.
  */
@@ -1888,7 +1888,7 @@ eaccess(td, uap)
 	return (error);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Get file status; this version follows links.
  */
@@ -1991,7 +1991,7 @@ cvtstat(st, ost)
 	ost->st_flags = st->st_flags;
 	ost->st_gen = st->st_gen;
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Get file status; this version follows links.
@@ -2965,7 +2965,7 @@ ftruncate(td, uap)
 	return (error);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Truncate a file given its path name.
  */
@@ -3021,7 +3021,7 @@ oftruncate(td, uap)
 	nuap.length = uap->length;
 	return (ftruncate(td, &nuap));
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Sync an open file.
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 3ce9c98..50ab8ed 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1733,7 +1733,7 @@ lseek(td, uap)
 	return (0);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Reposition read/write file offset.
  */
@@ -1888,7 +1888,7 @@ eaccess(td, uap)
 	return (error);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Get file status; this version follows links.
  */
@@ -1991,7 +1991,7 @@ cvtstat(st, ost)
 	ost->st_flags = st->st_flags;
 	ost->st_gen = st->st_gen;
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Get file status; this version follows links.
@@ -2965,7 +2965,7 @@ ftruncate(td, uap)
 	return (error);
 }
 
-#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_43)
 /*
  * Truncate a file given its path name.
  */
@@ -3021,7 +3021,7 @@ oftruncate(td, uap)
 	nuap.length = uap->length;
 	return (ftruncate(td, &nuap));
 }
-#endif /* COMPAT_43 || COMPAT_SUNOS */
+#endif /* COMPAT_43 */
 
 /*
  * Sync an open file.