Module Name: src
Committed By: maxv
Date: Mon Mar 25 19:24:31 UTC 2019
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: options.4
src/share/man/man7: hier.7 symlink.7
src/share/man/man8: Makefile
src/sys/arch/alpha/alpha: compat_16_machdep.c fp_complete.c machdep.c
src/sys/arch/alpha/conf: GENERIC files.alpha
src/sys/arch/alpha/include: frame.h signal.h
src/sys/compat: Makefile Makefile.syscall
src/sys/conf: files
src/sys/sys: ioctl.h
src/usr.bin/kdump: setemul.c
Removed Files:
src/share/man/man8: compat_osf1.8
src/sys/arch/alpha/alpha: osf1_sigcode.s osf1_syscall.c
src/sys/compat/osf1: Makefile README.dynamic README.mach-traps
README.syscalls files.osf1 osf1.h osf1_cvt.c osf1_cvt.h
osf1_descrip.c osf1_dirent.h osf1_errno.c osf1_errno.h osf1_exec.c
osf1_exec.h osf1_exec_ecoff.c osf1_file.c osf1_generic.c
osf1_ioctl.c osf1_misc.c osf1_mmap.c osf1_mod.c osf1_mount.c
osf1_prot.c osf1_resource.c osf1_signal.c osf1_signal.h
osf1_signo.c osf1_socket.c osf1_syscall.h osf1_syscallargs.h
osf1_syscalls.c osf1_sysent.c osf1_sysv_ipc.c osf1_time.c
syscalls.conf syscalls.master
Log Message:
Remove compat_osf1, discussed on tech-kern@.
To generate a diff of this commit:
cvs rdiff -u -r1.1640 -r1.1641 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.497 -r1.498 src/share/man/man4/options.4
cvs rdiff -u -r1.135 -r1.136 src/share/man/man7/hier.7
cvs rdiff -u -r1.28 -r1.29 src/share/man/man7/symlink.7
cvs rdiff -u -r1.107 -r1.108 src/share/man/man8/Makefile
cvs rdiff -u -r1.12 -r0 src/share/man/man8/compat_osf1.8
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/alpha/compat_16_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/alpha/fp_complete.c
cvs rdiff -u -r1.352 -r1.353 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/alpha/alpha/osf1_sigcode.s
cvs rdiff -u -r1.35 -r0 src/sys/arch/alpha/alpha/osf1_syscall.c
cvs rdiff -u -r1.390 -r1.391 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/frame.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/signal.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/Makefile.syscall
cvs rdiff -u -r1.7 -r0 src/sys/compat/osf1/Makefile \
src/sys/compat/osf1/osf1_errno.c src/sys/compat/osf1/osf1_sysv_ipc.c
cvs rdiff -u -r1.3 -r0 src/sys/compat/osf1/README.dynamic \
src/sys/compat/osf1/README.mach-traps src/sys/compat/osf1/README.syscalls \
src/sys/compat/osf1/osf1_errno.h
cvs rdiff -u -r1.22 -r0 src/sys/compat/osf1/files.osf1
cvs rdiff -u -r1.27 -r0 src/sys/compat/osf1/osf1.h
cvs rdiff -u -r1.28 -r0 src/sys/compat/osf1/osf1_cvt.c
cvs rdiff -u -r1.11 -r0 src/sys/compat/osf1/osf1_cvt.h
cvs rdiff -u -r1.29 -r0 src/sys/compat/osf1/osf1_descrip.c
cvs rdiff -u -r1.1 -r0 src/sys/compat/osf1/osf1_dirent.h
cvs rdiff -u -r1.47 -r0 src/sys/compat/osf1/osf1_exec.c
cvs rdiff -u -r1.13 -r0 src/sys/compat/osf1/osf1_exec.h \
src/sys/compat/osf1/osf1_prot.c
cvs rdiff -u -r1.24 -r0 src/sys/compat/osf1/osf1_exec_ecoff.c
cvs rdiff -u -r1.45 -r0 src/sys/compat/osf1/osf1_file.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/osf1/osf1_generic.c
cvs rdiff -u -r1.23 -r0 src/sys/compat/osf1/osf1_ioctl.c \
src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.88 -r0 src/sys/compat/osf1/osf1_misc.c
cvs rdiff -u -r1.14 -r0 src/sys/compat/osf1/osf1_mmap.c
cvs rdiff -u -r1.6 -r0 src/sys/compat/osf1/osf1_mod.c \
src/sys/compat/osf1/osf1_signal.h
cvs rdiff -u -r1.55 -r0 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.15 -r0 src/sys/compat/osf1/osf1_resource.c
cvs rdiff -u -r1.36 -r0 src/sys/compat/osf1/osf1_signal.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/osf1/osf1_signo.c \
src/sys/compat/osf1/syscalls.conf
cvs rdiff -u -r1.67 -r0 src/sys/compat/osf1/osf1_syscall.h
cvs rdiff -u -r1.68 -r0 src/sys/compat/osf1/osf1_syscallargs.h \
src/sys/compat/osf1/osf1_sysent.c
cvs rdiff -u -r1.66 -r0 src/sys/compat/osf1/osf1_syscalls.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/osf1/osf1_time.c
cvs rdiff -u -r1.49 -r0 src/sys/compat/osf1/syscalls.master
cvs rdiff -u -r1.1231 -r1.1232 src/sys/conf/files
cvs rdiff -u -r1.38 -r1.39 src/sys/sys/ioctl.h
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/kdump/setemul.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1640 src/distrib/sets/lists/man/mi:1.1641
--- src/distrib/sets/lists/man/mi:1.1640 Sun Mar 17 00:35:09 2019
+++ src/distrib/sets/lists/man/mi Mon Mar 25 19:24:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1640 2019/03/17 00:35:09 tnn Exp $
+# $NetBSD: mi,v 1.1641 2019/03/25 19:24:29 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2448,7 +2448,7 @@
./usr/share/man/cat8/compat_ibcs2.0 man-obsolete obsolete
./usr/share/man/cat8/compat_linux.0 man-sys-catman .cat
./usr/share/man/cat8/compat_netbsd32.0 man-sys-catman .cat
-./usr/share/man/cat8/compat_osf1.0 man-sys-catman .cat
+./usr/share/man/cat8/compat_osf1.0 man-obsolete obsolete
./usr/share/man/cat8/compat_pecoff.0 man-obsolete obsolete
./usr/share/man/cat8/compat_sco.0 man-obsolete obsolete
./usr/share/man/cat8/compat_solaris.0 man-obsolete obsolete
@@ -5467,7 +5467,7 @@
./usr/share/man/html8/compat_ibcs2.html man-obsolete obsolete
./usr/share/man/html8/compat_linux.html man-sys-htmlman html
./usr/share/man/html8/compat_netbsd32.html man-sys-htmlman html
-./usr/share/man/html8/compat_osf1.html man-sys-htmlman html
+./usr/share/man/html8/compat_osf1.html man-obsolete obsolete
./usr/share/man/html8/compat_pecoff.html man-obsolete obsolete
./usr/share/man/html8/compat_sco.html man-obsolete obsolete
./usr/share/man/html8/compat_solaris.html man-obsolete obsolete
@@ -8539,7 +8539,7 @@
./usr/share/man/man8/compat_ibcs2.8 man-obsolete obsolete
./usr/share/man/man8/compat_linux.8 man-sys-man .man
./usr/share/man/man8/compat_netbsd32.8 man-sys-man .man
-./usr/share/man/man8/compat_osf1.8 man-sys-man .man
+./usr/share/man/man8/compat_osf1.8 man-obsolete obsolete
./usr/share/man/man8/compat_pecoff.8 man-obsolete obsolete
./usr/share/man/man8/compat_sco.8 man-obsolete obsolete
./usr/share/man/man8/compat_solaris.8 man-obsolete obsolete
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.497 src/share/man/man4/options.4:1.498
--- src/share/man/man4/options.4:1.497 Sat Dec 29 11:30:11 2018
+++ src/share/man/man4/options.4 Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.497 2018/12/29 11:30:11 maxv Exp $
+.\" $NetBSD: options.4,v 1.498 2019/03/25 19:24:30 maxv Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd December 29, 2018
+.Dd March 25, 2019
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -440,13 +440,6 @@ compatibility with
.Fx
applications built for the same architecture.
At the moment this is limited to the i386 port.
-.It Cd options COMPAT_OSF1
-On those architectures that support it, this enables binary
-compatibility with Digital
-.Ux
-(formerly OSF/1)
-applications built for the same architecture.
-This is currently limited to the alpha port.
.It Cd options COMPAT_NOMID
Enable compatibility with
.Xr a.out 5
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.135 src/share/man/man7/hier.7:1.136
--- src/share/man/man7/hier.7:1.135 Sat Dec 29 11:30:11 2018
+++ src/share/man/man7/hier.7 Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: hier.7,v 1.135 2018/12/29 11:30:11 maxv Exp $
+.\" $NetBSD: hier.7,v 1.136 2019/03/25 19:24:30 maxv Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)hier.7 8.5 (Berkeley) 6/1/94
.\"
-.Dd December 29, 2018
+.Dd March 25, 2019
.Dt HIER 7
.Os
.Sh NAME
@@ -893,10 +893,6 @@ Support for 4KB page 68000 binaries.
Support for
.Nx
32-bit binaries on 64 bit platforms with compatible CPU families.
-.It Pa osf1/
-Support for Digital
-.Ux
-(formerly OSF/1) binaries.
.It Pa ossaudio/
Support for OSS audio.
.It Pa sunos/
Index: src/share/man/man7/symlink.7
diff -u src/share/man/man7/symlink.7:1.28 src/share/man/man7/symlink.7:1.29
--- src/share/man/man7/symlink.7:1.28 Sat Dec 29 11:33:00 2018
+++ src/share/man/man7/symlink.7 Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: symlink.7,v 1.28 2018/12/29 11:33:00 maxv Exp $
+.\" $NetBSD: symlink.7,v 1.29 2019/03/25 19:24:30 maxv Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)symlink.7 8.3 (Berkeley) 3/31/94
.\"
-.Dd December 29, 2018
+.Dd March 25, 2019
.Dt SYMLINK 7
.Os
.Sh NAME
@@ -569,7 +569,6 @@ Other valid emulations are:
.Dv linux32 ,
.Dv m68k4k ,
.Dv netbsd32 ,
-.Dv osf1 ,
.Dv sunos ,
.Dv sunos32 ,
.Dv ultrix ,
Index: src/share/man/man8/Makefile
diff -u src/share/man/man8/Makefile:1.107 src/share/man/man8/Makefile:1.108
--- src/share/man/man8/Makefile:1.107 Sat Dec 29 11:30:11 2018
+++ src/share/man/man8/Makefile Mon Mar 25 19:24:30 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2018/12/29 11:30:11 maxv Exp $
+# $NetBSD: Makefile,v 1.108 2019/03/25 19:24:30 maxv Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \
compat_freebsd.8 compat_linux.8 \
- compat_netbsd32.8 compat_osf1.8 compat_sunos.8 \
+ compat_netbsd32.8 compat_sunos.8 \
compat_ultrix.8 diskless.8 hpcboot.8 \
intro.8 nis.8 pam.8 rc.8 rc.subr.8 rescue.8 \
sysinst.8 veriexec.8 \
Index: src/sys/arch/alpha/alpha/compat_16_machdep.c
diff -u src/sys/arch/alpha/alpha/compat_16_machdep.c:1.21 src/sys/arch/alpha/alpha/compat_16_machdep.c:1.22
--- src/sys/arch/alpha/alpha/compat_16_machdep.c:1.21 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/alpha/alpha/compat_16_machdep.c Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.21 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.22 2019/03/25 19:24:30 maxv Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -63,7 +63,6 @@
#include "opt_multiprocessor.h"
#include "opt_dec_3000_300.h"
#include "opt_dec_3000_500.h"
-#include "opt_compat_osf1.h"
#include "opt_compat_netbsd.h"
#include "opt_execfmt.h"
#endif /* _KERNEL_OPT */
@@ -78,7 +77,7 @@
#include <sys/syscall.h>
#include <sys/syscallargs.h>
-#if defined(COMPAT_13) || defined(COMPAT_OSF1)
+#if defined(COMPAT_13)
#include <compat/sys/signal.h>
#include <compat/sys/signalvar.h>
#endif
@@ -86,7 +85,7 @@
#include <machine/cpu.h>
#include <machine/reg.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.21 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.22 2019/03/25 19:24:30 maxv Exp $");
#ifdef DEBUG
@@ -146,7 +145,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi
/* Save signal mask. */
frame.sf_sc.sc_mask = *mask;
-#if defined(COMPAT_13) || defined(COMPAT_OSF1)
+#if defined(COMPAT_13)
/*
* XXX We always have to save an old style signal mask because
* XXX we might be delivering a signal to a process which will
@@ -231,7 +230,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi
#endif
}
-#ifdef COMPAT_16 /* not needed if COMPAT_OSF1 only */
+#ifdef COMPAT_16
/*
* System call to cleanup state after a signal
* has been taken. Reset signal mask and
Index: src/sys/arch/alpha/alpha/fp_complete.c
diff -u src/sys/arch/alpha/alpha/fp_complete.c:1.22 src/sys/arch/alpha/alpha/fp_complete.c:1.23
--- src/sys/arch/alpha/alpha/fp_complete.c:1.22 Sun Dec 31 11:43:42 2017
+++ src/sys/arch/alpha/alpha/fp_complete.c Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fp_complete.c,v 1.22 2017/12/31 11:43:42 martin Exp $ */
+/* $NetBSD: fp_complete.c,v 1.23 2019/03/25 19:24:30 maxv Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -35,9 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.22 2017/12/31 11:43:42 martin Exp $");
-
-#include "opt_compat_osf1.h"
+__KERNEL_RCSID(0, "$NetBSD: fp_complete.c,v 1.23 2019/03/25 19:24:30 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,10 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: fp_complete.
#include <sys/atomic.h>
#include <sys/evcnt.h>
-#ifdef COMPAT_OSF1
-#include <compat/osf1/osf1_exec.h>
-#endif
-
#include <machine/cpu.h>
#include <machine/fpu.h>
#include <machine/reg.h>
@@ -658,12 +652,6 @@ alpha_fp_complete(u_long a0, u_long a1,
* interpret this one instruction in SW. If a SIGFPE is not required, back up
* the PC until just after this instruction and restart. This will execute all
* trap shadow instructions between the trigger pc and the trap pc twice.
- *
- * If a SIGFPE is generated from the OSF1 emulation, back up one more
- * instruction to the trigger pc itself. Native binaries don't because it
- * is non-portable and completely defeats the intended purpose of IEEE
- * traps -- for example, to count the number of exponent wraps for a later
- * correction.
*/
trigger_pc = 0;
win_begin = pc;
@@ -712,10 +700,6 @@ alpha_fp_complete(u_long a0, u_long a1,
done:
if (sig) {
usertrap_pc = trigger_pc + 1;
-#ifdef COMPAT_OSF1
- if (l->l_proc->p_emul == &emul_osf1)
- usertrap_pc = trigger_pc;
-#endif
l->l_md.md_tf->tf_regs[FRAME_PC] = (unsigned long)usertrap_pc;
return sig;
}
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.352 src/sys/arch/alpha/alpha/machdep.c:1.353
--- src/sys/arch/alpha/alpha/machdep.c:1.352 Tue Nov 27 14:09:53 2018
+++ src/sys/arch/alpha/alpha/machdep.c Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.352 2018/11/27 14:09:53 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.353 2019/03/25 19:24:30 maxv Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -63,12 +63,11 @@
#include "opt_multiprocessor.h"
#include "opt_dec_3000_300.h"
#include "opt_dec_3000_500.h"
-#include "opt_compat_osf1.h"
#include "opt_execfmt.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.352 2018/11/27 14:09:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.353 2019/03/25 19:24:30 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.390 src/sys/arch/alpha/conf/GENERIC:1.391
--- src/sys/arch/alpha/conf/GENERIC:1.390 Sat Mar 16 08:03:03 2019
+++ src/sys/arch/alpha/conf/GENERIC Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.390 2019/03/16 08:03:03 maxv Exp $
+# $NetBSD: GENERIC,v 1.391 2019/03/25 19:24:30 maxv Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.390 $"
+ident "GENERIC-$Revision: 1.391 $"
maxusers 32
@@ -129,9 +129,6 @@ options PPP_FILTER # Active filter supp
# Binary compatibility with previous versions of NetBSD.
include "conf/compat_netbsd09.config"
-# OSF/1 binary compatibility
-#options COMPAT_OSF1
-
# Linux binary compatibility
options COMPAT_LINUX
Index: src/sys/arch/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.189 src/sys/arch/alpha/conf/files.alpha:1.190
--- src/sys/arch/alpha/conf/files.alpha:1.189 Thu Feb 22 07:30:43 2018
+++ src/sys/arch/alpha/conf/files.alpha Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.189 2018/02/22 07:30:43 mrg Exp $
+# $NetBSD: files.alpha,v 1.190 2019/03/25 19:24:30 maxv Exp $
#
# alpha-specific configuration info
@@ -422,13 +422,8 @@ file arch/alpha/alpha/db_trace.c ddb
file arch/alpha/alpha/kgdb_machdep.c kgdb
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
-file arch/alpha/alpha/compat_13_machdep.c compat_13 | compat_osf1
-file arch/alpha/alpha/compat_16_machdep.c compat_16 | compat_osf1
-
-# OSF/1 Binary Compatibility (COMPAT_OSF1)
-include "compat/osf1/files.osf1"
-file arch/alpha/alpha/osf1_sigcode.s compat_osf1
-file arch/alpha/alpha/osf1_syscall.c compat_osf1
+file arch/alpha/alpha/compat_13_machdep.c compat_13
+file arch/alpha/alpha/compat_16_machdep.c compat_16
# Linux Binary Compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
Index: src/sys/arch/alpha/include/frame.h
diff -u src/sys/arch/alpha/include/frame.h:1.9 src/sys/arch/alpha/include/frame.h:1.10
--- src/sys/arch/alpha/include/frame.h:1.9 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/frame.h Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.9 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: frame.h,v 1.10 2019/03/25 19:24:30 maxv Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -92,7 +92,7 @@ struct trapframe {
unsigned long tf_regs[FRAME_SIZE]; /* See above */
};
-#if (defined(COMPAT_16) || defined(COMPAT_OSF1)) && defined(_KERNEL)
+#if defined(COMPAT_16) && defined(_KERNEL)
struct sigframe_sigcontext {
/* ra address of trampoline */
/* a0 signum for handler */
@@ -115,7 +115,7 @@ struct sigframe_siginfo {
void *getframe(const struct lwp *, int, int *);
void buildcontext(struct lwp *, const void *, const void *, const void *);
void sendsig_siginfo(const ksiginfo_t *, const sigset_t *);
-#if defined(COMPAT_16) || defined(COMPAT_OSF1)
+#if defined(COMPAT_16)
void sendsig_sigcontext(const ksiginfo_t *, const sigset_t *);
#endif
#endif
Index: src/sys/arch/alpha/include/signal.h
diff -u src/sys/arch/alpha/include/signal.h:1.16 src/sys/arch/alpha/include/signal.h:1.17
--- src/sys/arch/alpha/include/signal.h:1.16 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/signal.h Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.16 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: signal.h,v 1.17 2019/03/25 19:24:30 maxv Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -36,7 +36,6 @@ typedef long sig_atomic_t;
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
-#include "opt_compat_osf1.h"
#endif
/*
@@ -49,7 +48,7 @@ typedef long sig_atomic_t;
* Note that sc_regs[] and sc_fpregs[]+sc_fpcr are inline
* representations of 'struct reg' and 'struct fpreg', respectively.
*/
-#if defined(_KERNEL) && (defined(COMPAT_13) || defined(COMPAT_OSF1))
+#if defined(_KERNEL) && defined(COMPAT_13)
struct sigcontext13 {
long sc_onstack; /* sigstack state to restore */
long sc_mask; /* signal mask to restore (old style) */
@@ -64,9 +63,9 @@ struct sigcontext13 {
long sc_reserved[2]; /* XXX */
long sc_xxx[8]; /* XXX */
};
-#endif /* _KERNEL && (COMPAT_13 || COMPAT_OSF1) */
+#endif /* _KERNEL && COMPAT_13 */
-#if defined(_LIBC) || (defined(_KERNEL) && (defined(COMPAT_16) || defined(COMPAT_OSF1)))
+#if defined(_LIBC) || (defined(_KERNEL) && defined(COMPAT_16))
struct sigcontext {
long sc_onstack; /* sigstack state to restore */
long __sc_mask13; /* signal mask to restore (old style) */
Index: src/sys/compat/Makefile
diff -u src/sys/compat/Makefile:1.6 src/sys/compat/Makefile:1.7
--- src/sys/compat/Makefile:1.6 Sat Dec 29 11:30:12 2018
+++ src/sys/compat/Makefile Mon Mar 25 19:24:30 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/12/29 11:30:12 maxv Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/25 19:24:30 maxv Exp $
-#SUBDIR= common freebsd hpux linux m68k4k osf1 ossaudio sunos \
+#SUBDIR= common freebsd hpux linux m68k4k ossaudio sunos \
# ultrix netbsd32 sunos32
#INCSDIR= /usr/include/compat
Index: src/sys/compat/Makefile.syscall
diff -u src/sys/compat/Makefile.syscall:1.3 src/sys/compat/Makefile.syscall:1.4
--- src/sys/compat/Makefile.syscall:1.3 Sat Dec 29 11:30:12 2018
+++ src/sys/compat/Makefile.syscall Mon Mar 25 19:24:30 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.syscall,v 1.3 2018/12/29 11:30:12 maxv Exp $
+# $NetBSD: Makefile.syscall,v 1.4 2019/03/25 19:24:30 maxv Exp $
SUBDIR = aoutm68k freebsd linux linux32 netbsd32
-SUBDIR += osf1 sunos sunos32 ultrix
+SUBDIR += sunos sunos32 ultrix
.include <bsd.subdir.mk>
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1231 src/sys/conf/files:1.1232
--- src/sys/conf/files:1.1231 Sun Mar 17 01:06:42 2019
+++ src/sys/conf/files Mon Mar 25 19:24:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1231 2019/03/17 01:06:42 tnn Exp $
+# $NetBSD: files,v 1.1232 2019/03/25 19:24:30 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -155,7 +155,6 @@ defflag COMPAT_OSSAUDIO
defflag COMPAT_43
defflag COMPAT_FREEBSD: COMPAT_09, COMPAT_43
defflag COMPAT_LINUX: COMPAT_NETBSD, COMPAT_43
-defflag COMPAT_OSF1
defflag COMPAT_SUNOS: COMPAT_09, COMPAT_43
defflag COMPAT_ULTRIX: COMPAT_50
defflag COMPAT_NETBSD32
Index: src/sys/sys/ioctl.h
diff -u src/sys/sys/ioctl.h:1.38 src/sys/sys/ioctl.h:1.39
--- src/sys/sys/ioctl.h:1.38 Sat Dec 29 11:30:12 2018
+++ src/sys/sys/ioctl.h Mon Mar 25 19:24:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ioctl.h,v 1.38 2018/12/29 11:30:12 maxv Exp $ */
+/* $NetBSD: ioctl.h,v 1.39 2019/03/25 19:24:31 maxv Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -105,11 +105,10 @@ __END_DECLS
#include "opt_compat_freebsd.h"
#include "opt_compat_sunos.h"
#include "opt_compat_43.h"
-#include "opt_compat_osf1.h"
#include "opt_modular.h"
#endif
#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS) || \
- defined(COMPAT_FREEBSD) || defined(COMPAT_OSF1) || defined(MODULAR)
+ defined(COMPAT_FREEBSD) || defined(MODULAR)
#include <sys/ioctl_compat.h>
#endif
Index: src/usr.bin/kdump/setemul.c
diff -u src/usr.bin/kdump/setemul.c:1.31 src/usr.bin/kdump/setemul.c:1.32
--- src/usr.bin/kdump/setemul.c:1.31 Sat Dec 29 18:09:32 2018
+++ src/usr.bin/kdump/setemul.c Mon Mar 25 19:24:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: setemul.c,v 1.31 2018/12/29 18:09:32 martin Exp $ */
+/* $NetBSD: setemul.c,v 1.32 2019/03/25 19:24:31 maxv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: setemul.c,v 1.31 2018/12/29 18:09:32 martin Exp $");
+__RCSID("$NetBSD: setemul.c,v 1.32 2019/03/25 19:24:31 maxv Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -85,7 +85,6 @@ __RCSID("$NetBSD: setemul.c,v 1.31 2018/
#include "../../sys/compat/freebsd/freebsd_syscall.h"
#include "../../sys/compat/linux/linux_syscall.h"
#include "../../sys/compat/linux32/linux32_syscall.h"
-#include "../../sys/compat/osf1/osf1_syscall.h"
#include "../../sys/compat/sunos32/sunos32_syscall.h"
#include "../../sys/compat/sunos/sunos_syscall.h"
#include "../../sys/compat/ultrix/ultrix_syscall.h"
@@ -100,7 +99,6 @@ __RCSID("$NetBSD: setemul.c,v 1.31 2018/
#include "../../sys/compat/freebsd/freebsd_syscalls.c"
#include "../../sys/compat/linux/linux_syscalls.c"
#include "../../sys/compat/linux32/linux32_syscalls.c"
-#include "../../sys/compat/osf1/osf1_syscalls.c"
#include "../../sys/compat/sunos/sunos_syscalls.c"
#include "../../sys/compat/sunos32/sunos32_syscalls.c"
#include "../../sys/compat/ultrix/ultrix_syscalls.c"
@@ -108,12 +106,10 @@ __RCSID("$NetBSD: setemul.c,v 1.31 2018/
#include "../../sys/compat/aoutm68k/aoutm68k_syscalls.c"
#endif
-#include "../../sys/compat/osf1/osf1_errno.c"
#include "../../sys/compat/linux/common/linux_errno.c"
#undef KTRACE
#define SIGRTMIN 33 /* XXX */
-#include "../../sys/compat/osf1/osf1_signo.c"
#include "../../sys/compat/linux/common/linux_signo.c"
#define NELEM(a) (sizeof(a) / sizeof(a[0]))
@@ -140,10 +136,6 @@ const struct emulation emulations[] = {
native_to_linux_errno, NELEM(native_to_linux_errno),
linux_to_native_signo, NSIG, EMUL_FLAG_NETBSD32 },
- { "osf1", osf1_syscallnames, OSF1_SYS_MAXSYSCALL,
- native_to_osf1_errno, NELEM(native_to_osf1_errno),
- osf1_to_native_signo, NSIG, 0 },
-
{ "sunos32", sunos32_syscallnames, SUNOS32_SYS_MAXSYSCALL,
NULL, 0,
NULL, 0, EMUL_FLAG_NETBSD32 },
