summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/systrace/openbsd-syscalls.c5
-rw-r--r--etc/etc.hp300/sysctl.conf1
-rw-r--r--etc/etc.mac68k/sysctl.conf1
-rw-r--r--etc/etc.mvme68k/sysctl.conf1
-rw-r--r--etc/etc.sparc/sysctl.conf1
-rw-r--r--share/man/man4/options.412
-rw-r--r--share/man/man7/hier.75
-rw-r--r--share/man/man8/Makefile5
-rw-r--r--share/man/man8/compat_sunos.8114
-rw-r--r--usr.bin/kdump/kdump.c5
10 files changed, 8 insertions, 142 deletions
diff --git a/bin/systrace/openbsd-syscalls.c b/bin/systrace/openbsd-syscalls.c
index 6b8385130fa..06d2f3c2bfc 100644
--- a/bin/systrace/openbsd-syscalls.c
+++ b/bin/systrace/openbsd-syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openbsd-syscalls.c,v 1.36 2010/07/01 17:26:52 tedu Exp $ */
+/* $OpenBSD: openbsd-syscalls.c,v 1.37 2010/07/02 20:00:54 tedu Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -36,7 +36,6 @@
#include <compat/bsdos/bsdos_syscall.h>
#include <compat/freebsd/freebsd_syscall.h>
#include <compat/linux/linux_syscall.h>
-#include <compat/sunos/sunos_syscall.h>
#include <compat/svr4/svr4_syscall.h>
#define KTRACE
@@ -53,7 +52,6 @@
#include <compat/bsdos/bsdos_syscalls.c>
#include <compat/freebsd/freebsd_syscalls.c>
#include <compat/linux/linux_syscalls.c>
-#include <compat/sunos/sunos_syscalls.c>
#include <compat/svr4/svr4_syscalls.c>
#undef KTRACE
#undef PTRACE
@@ -89,7 +87,6 @@ static struct emulation emulations[] = {
{ "native", syscallnames, SYS_MAXSYSCALL },
{ "aout", syscallnames, SYS_MAXSYSCALL },
{ "linux", linux_syscallnames, LINUX_SYS_MAXSYSCALL },
- { "sunos", sunos_syscallnames, SUNOS_SYS_MAXSYSCALL },
{ "svr4", svr4_syscallnames, SVR4_SYS_MAXSYSCALL },
{ "bsdos", bsdos_syscallnames, BSDOS_SYS_MAXSYSCALL },
{ "freebsd", freebsd_syscallnames, FREEBSD_SYS_MAXSYSCALL },
diff --git a/etc/etc.hp300/sysctl.conf b/etc/etc.hp300/sysctl.conf
index 06256a46022..e69de29bb2d 100644
--- a/etc/etc.hp300/sysctl.conf
+++ b/etc/etc.hp300/sysctl.conf
@@ -1 +0,0 @@
-#kern.emul.sunos=1 # enable running SunOS binaries
diff --git a/etc/etc.mac68k/sysctl.conf b/etc/etc.mac68k/sysctl.conf
index 06256a46022..e69de29bb2d 100644
--- a/etc/etc.mac68k/sysctl.conf
+++ b/etc/etc.mac68k/sysctl.conf
@@ -1 +0,0 @@
-#kern.emul.sunos=1 # enable running SunOS binaries
diff --git a/etc/etc.mvme68k/sysctl.conf b/etc/etc.mvme68k/sysctl.conf
index 06256a46022..e69de29bb2d 100644
--- a/etc/etc.mvme68k/sysctl.conf
+++ b/etc/etc.mvme68k/sysctl.conf
@@ -1 +0,0 @@
-#kern.emul.sunos=1 # enable running SunOS binaries
diff --git a/etc/etc.sparc/sysctl.conf b/etc/etc.sparc/sysctl.conf
index 8e573274d3b..522a926a964 100644
--- a/etc/etc.sparc/sysctl.conf
+++ b/etc/etc.sparc/sysctl.conf
@@ -1,3 +1,2 @@
#machdep.led_blink=1 # 1=On sparc, make led(s) blink
-#kern.emul.sunos=1 # enable running SunOS binaries
#kern.emul.svr4=1 # enable running SVR4 binaries
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index fdd5e6e2258..80b7bf4ceef 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: options.4,v 1.200 2010/07/01 17:26:52 tedu Exp $
+.\" $OpenBSD: options.4,v 1.201 2010/07/02 20:00:54 tedu Exp $
.\" $NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
.\"
.\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: July 1 2010 $
+.Dd $Mdocdate: July 2 2010 $
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -130,14 +130,6 @@ and
system calls which were replaced in
.Ox 4.4
when struct stat was expanded.
-.It Cd option COMPAT_SUNOS
-On those architectures that support it, this enables binary
-compatibility with
-.Em SunOS 4.x
-applications built for the same architecture.
-This option is supported on sparc and all m68k architectures.
-See
-.Xr compat_sunos 8 .
.It Cd option COMPAT_SVR4
On those architectures that support it, this enables binary
compatibility with
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index c8fd57b615c..bec9c5c39df 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hier.7,v 1.83 2010/07/01 18:45:08 jmc Exp $
+.\" $OpenBSD: hier.7,v 1.84 2010/07/02 20:00:54 tedu Exp $
.\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: July 1 2010 $
+.Dd $Mdocdate: July 2 2010 $
.Dt HIER 7
.Os
.Sh NAME
@@ -82,7 +82,6 @@ and the system compat pages:
.Xr compat_bsdos 8 ,
.Xr compat_freebsd 8 ,
.Xr compat_linux 8 ,
-.Xr compat_sunos 8 ,
and
.Xr compat_svr4 8 ) .
.It /etc/
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 4c4cf0ac79a..4a878f7c296 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.71 2010/07/01 17:26:52 tedu Exp $
+# $OpenBSD: Makefile,v 1.72 2010/07/02 20:00:54 tedu Exp $
# $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= afterboot.8 boot_config.8 compat_aout.8 compat_bsdos.8 \
- compat_freebsd.8 \
- compat_linux.8 compat_sunos.8 \
+ compat_freebsd.8 compat_linux.8 \
compat_svr4.8 crash.8 daily.8 dhcp.8 \
diskless.8 genassym.sh.8 intro.8 netstart.8 rc.8 \
rc.conf.8 rc.shutdown.8 release.8 security.8 ssl.8 \
diff --git a/share/man/man8/compat_sunos.8 b/share/man/man8/compat_sunos.8
deleted file mode 100644
index 18d803227f6..00000000000
--- a/share/man/man8/compat_sunos.8
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" $OpenBSD: compat_sunos.8,v 1.18 2010/01/03 16:43:45 schwarze Exp $
-.\" $NetBSD: compat_sunos.8,v 1.6 1995/06/11 23:05:17 pk Exp $
-.\"
-.\" Copyright (c) 1994 Theo de Raadt
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: January 3 2010 $
-.Dt COMPAT_SUNOS 8
-.Os
-.Sh NAME
-.Nm compat_sunos
-.Nd setup for running SunOS binaries under emulation
-.Sh DESCRIPTION
-OpenBSD/sparc and some of the OpenBSD/m68k architectures can run
-SunOS executables.
-Most executables will work.
-.Pp
-The SunOS compatibility feature is active
-for kernels compiled with the
-.Nm COMPAT_SUNOS
-option and kern.emul.sunos
-.Xr sysctl 8
-enabled.
-.Pp
-Compatibility with SunOS version 5 and later, better known as Solaris,
-is
-.Em not
-addressed by these instructions; please read the
-.Xr compat_svr4 8
-manual page instead.
-.Pp
-The exceptions include programs that use the SunOS kvm library,
-and various system calls, ioctl()'s, or kernel semantics
-that are difficult to emulate.
-The number of reasons why a program might fail to work is (thankfully)
-longer than the number of programs that fail to run.
-.Pp
-Static executables will normally run without any extra setup.
-This procedure details the directories and files that must be
-set up to allow dynamically linked executables to work.
-.Pp
-The files needed can be found on the SunOS machine.
-The user is responsible for the legal issues of ensuring that they
-have a right to use the required files on their machine.
-On the
-.Ox
-machine, do the following:
-.Pp
-.Bl -enum -offset 123 -compact
-.It
-.Li mkdir -p /emul/sunos/usr/lib /emul/sunos/usr/5lib
-.fi
-.Pp
-.It
-.Li cp SunOS:/usr/lib/lib*.so.*.* OpenBSD:/emul/sunos/usr/lib
-.Pp
-.It
-.Li cp SunOS:/usr/5lib/lib*.so.*.* OpenBSD:/emul/sunos/usr/5lib
-.Pp
-.It
-.Li cp SunOS:/usr/lib/ld.so OpenBSD:/emul/sunos/usr/lib/ld.so
-.Pp
-.It
-If YP is going to be used, create a link:
-.nf
-.Li ln -s /var/run/ypbind.lock /etc/ypbind.lock
-.fi
-.El
-.Pp
-Alternatively, an NFS mount can accomplish the same
-effect.
-On the
-.Ox
-machine, do the following:
-.Pp
-.Bl -enum -offset 123 -compact
-.It
-.Li mkdir -p /emul/sunos/usr
-.Pp
-.It
-.Li mount SunOS:/usr /emul/sunos/usr
-.fi
-.El
-.Pp
-This will place the SunOS libraries on the
-.Ox
-machine in a location where the SunOS compatibility code will look
-first, in order to avoid conflict with the standard libraries.
-.Sh SEE ALSO
-.Xr compat_svr4 8
-.Sh BUGS
-A list of things which fail to work in compatibility mode should
-be here.
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 2523f1da1e1..3430f128105 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdump.c,v 1.45 2010/07/01 17:26:52 tedu Exp $ */
+/* $OpenBSD: kdump.c,v 1.46 2010/07/02 20:00:54 tedu Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -65,7 +65,6 @@ pid_t pid = -1;
#include <compat/bsdos/bsdos_syscall.h>
#include <compat/freebsd/freebsd_syscall.h>
#include <compat/linux/linux_syscall.h>
-#include <compat/sunos/sunos_syscall.h>
#include <compat/svr4/svr4_syscall.h>
#define KTRACE
@@ -82,7 +81,6 @@ pid_t pid = -1;
#include <compat/bsdos/bsdos_syscalls.c>
#include <compat/freebsd/freebsd_syscalls.c>
#include <compat/linux/linux_syscalls.c>
-#include <compat/sunos/sunos_syscalls.c>
#include <compat/svr4/svr4_syscalls.c>
#undef KTRACE
#undef PTRACE
@@ -103,7 +101,6 @@ struct emulation {
static struct emulation emulations[] = {
{ "native", syscallnames, SYS_MAXSYSCALL },
{ "linux", linux_syscallnames, LINUX_SYS_MAXSYSCALL },
- { "sunos", sunos_syscallnames, SUNOS_SYS_MAXSYSCALL },
{ "svr4", svr4_syscallnames, SVR4_SYS_MAXSYSCALL },
{ "bsdos", bsdos_syscallnames, BSDOS_SYS_MAXSYSCALL },
{ "freebsd", freebsd_syscallnames, FREEBSD_SYS_MAXSYSCALL },
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:42:23 +0000