Module Name: src
Committed By: maxv
Date: Sat Dec 29 11:30:13 UTC 2018
Modified Files:
src/distrib/sets/lists/comp: md.vax
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/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/arch/vax/conf: GENERIC VAX780 files.vax
src/sys/arch/vax/include: Makefile signal.h
src/sys/arch/vax/vax: compat_13_machdep.c compat_16_machdep.c machdep.c
sig_machdep.c subr.S
src/sys/compat: Makefile Makefile.syscall
src/sys/conf: files
src/sys/sys: ioctl.h
Removed Files:
src/share/man/man8: compat_ibcs2.8
src/sys/arch/vax/include: ibcs2_machdep.h
src/sys/arch/vax/vax: ibcs2_machdep.c
src/sys/compat/ibcs2: Makefile TODO files.ibcs2 ibcs2_dirent.h
ibcs2_errno.c ibcs2_errno.h ibcs2_exec.c ibcs2_exec.h
ibcs2_exec_coff.c ibcs2_exec_elf32.c ibcs2_exec_xout.c
ibcs2_fcntl.c ibcs2_fcntl.h ibcs2_grp.h ibcs2_ioctl.c ibcs2_ipc.c
ibcs2_misc.c ibcs2_mman.h ibcs2_mod.c ibcs2_mount.h ibcs2_pwd.h
ibcs2_signal.c ibcs2_signal.h ibcs2_signo.c ibcs2_socksys.c
ibcs2_socksys.h ibcs2_stat.c ibcs2_stat.h ibcs2_statfs.h
ibcs2_stropts.h ibcs2_syscall.h ibcs2_syscallargs.h
ibcs2_syscalls.c ibcs2_sysent.c ibcs2_sysi86.h ibcs2_termios.h
ibcs2_time.h ibcs2_timeb.h ibcs2_types.h ibcs2_unistd.h
ibcs2_ustat.h ibcs2_util.h ibcs2_utime.h ibcs2_utsname.h
ibcs2_wait.h syscalls.conf syscalls.master
src/sys/modules/compat_ibcs2: Makefile
Log Message:
Retire compat_ibcs2, as discussed on tech-kern@. FreeBSD did the same
recently.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/md.vax
cvs rdiff -u -r1.1635 -r1.1636 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.496 -r1.497 src/share/man/man4/options.4
cvs rdiff -u -r1.134 -r1.135 src/share/man/man7/hier.7
cvs rdiff -u -r1.26 -r1.27 src/share/man/man7/symlink.7
cvs rdiff -u -r1.106 -r1.107 src/share/man/man8/Makefile
cvs rdiff -u -r1.11 -r0 src/share/man/man8/compat_ibcs2.8
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.460 -r1.461 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/vax/conf/files.vax
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/include/Makefile
cvs rdiff -u -r1.12 -r0 src/sys/arch/vax/include/ibcs2_machdep.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/include/signal.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/vax/compat_13_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/compat_16_machdep.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/vax/vax/ibcs2_machdep.c
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/vax/vax/sig_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/vax/subr.S
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/Makefile.syscall
cvs rdiff -u -r1.6 -r0 src/sys/compat/ibcs2/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/compat/ibcs2/TODO \
src/sys/compat/ibcs2/ibcs2_mod.c src/sys/compat/ibcs2/ibcs2_types.h
cvs rdiff -u -r1.10 -r0 src/sys/compat/ibcs2/files.ibcs2
cvs rdiff -u -r1.3 -r0 src/sys/compat/ibcs2/ibcs2_dirent.h \
src/sys/compat/ibcs2/ibcs2_statfs.h src/sys/compat/ibcs2/ibcs2_utsname.h
cvs rdiff -u -r1.9 -r0 src/sys/compat/ibcs2/ibcs2_errno.c \
src/sys/compat/ibcs2/ibcs2_util.h
cvs rdiff -u -r1.4 -r0 src/sys/compat/ibcs2/ibcs2_errno.h \
src/sys/compat/ibcs2/ibcs2_stat.h src/sys/compat/ibcs2/ibcs2_termios.h \
src/sys/compat/ibcs2/ibcs2_timeb.h src/sys/compat/ibcs2/syscalls.conf
cvs rdiff -u -r1.79 -r0 src/sys/compat/ibcs2/ibcs2_exec.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/ibcs2/ibcs2_exec.h
cvs rdiff -u -r1.29 -r0 src/sys/compat/ibcs2/ibcs2_exec_coff.c \
src/sys/compat/ibcs2/ibcs2_signal.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/ibcs2/ibcs2_exec_elf32.c
cvs rdiff -u -r1.18 -r0 src/sys/compat/ibcs2/ibcs2_exec_xout.c
cvs rdiff -u -r1.35 -r0 src/sys/compat/ibcs2/ibcs2_fcntl.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/ibcs2/ibcs2_fcntl.h \
src/sys/compat/ibcs2/ibcs2_grp.h src/sys/compat/ibcs2/ibcs2_mount.h \
src/sys/compat/ibcs2/ibcs2_pwd.h src/sys/compat/ibcs2/ibcs2_stropts.h \
src/sys/compat/ibcs2/ibcs2_sysi86.h src/sys/compat/ibcs2/ibcs2_time.h \
src/sys/compat/ibcs2/ibcs2_unistd.h src/sys/compat/ibcs2/ibcs2_ustat.h \
src/sys/compat/ibcs2/ibcs2_utime.h src/sys/compat/ibcs2/ibcs2_wait.h
cvs rdiff -u -r1.46 -r0 src/sys/compat/ibcs2/ibcs2_ioctl.c
cvs rdiff -u -r1.27 -r0 src/sys/compat/ibcs2/ibcs2_ipc.c
cvs rdiff -u -r1.116 -r0 src/sys/compat/ibcs2/ibcs2_misc.c
cvs rdiff -u -r1.1 -r0 src/sys/compat/ibcs2/ibcs2_mman.h \
src/sys/compat/ibcs2/ibcs2_signo.c
cvs rdiff -u -r1.21 -r0 src/sys/compat/ibcs2/ibcs2_signal.h
cvs rdiff -u -r1.19 -r0 src/sys/compat/ibcs2/ibcs2_socksys.c
cvs rdiff -u -r1.8 -r0 src/sys/compat/ibcs2/ibcs2_socksys.h
cvs rdiff -u -r1.50 -r0 src/sys/compat/ibcs2/ibcs2_stat.c
cvs rdiff -u -r1.56 -r0 src/sys/compat/ibcs2/ibcs2_syscall.h
cvs rdiff -u -r1.57 -r0 src/sys/compat/ibcs2/ibcs2_syscallargs.h \
src/sys/compat/ibcs2/ibcs2_syscalls.c
cvs rdiff -u -r1.58 -r0 src/sys/compat/ibcs2/ibcs2_sysent.c
cvs rdiff -u -r1.41 -r0 src/sys/compat/ibcs2/syscalls.master
cvs rdiff -u -r1.1220 -r1.1221 src/sys/conf/files
cvs rdiff -u -r1.4 -r0 src/sys/modules/compat_ibcs2/Makefile
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/ioctl.h
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/comp/md.vax
diff -u src/distrib/sets/lists/comp/md.vax:1.47 src/distrib/sets/lists/comp/md.vax:1.48
--- src/distrib/sets/lists/comp/md.vax:1.47 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.vax Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.47 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.vax,v 1.48 2018/12/29 11:30:11 maxv Exp $
./usr/include/gcc-4.5/tgmath.h comp-obsolete obsolete
./usr/include/gcc-4.8/tgmath.h comp-c-include obsolete
./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
@@ -23,7 +23,7 @@
./usr/include/vax/endian_machdep.h comp-c-include
./usr/include/vax/float.h comp-c-include
./usr/include/vax/frame.h comp-c-include
-./usr/include/vax/ibcs2_machdep.h comp-c-include
+./usr/include/vax/ibcs2_machdep.h comp-obsolete obsolete
./usr/include/vax/int_const.h comp-c-include
./usr/include/vax/int_fmtio.h comp-c-include
./usr/include/vax/int_limits.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1635 src/distrib/sets/lists/man/mi:1.1636
--- src/distrib/sets/lists/man/mi:1.1635 Thu Dec 20 07:30:00 2018
+++ src/distrib/sets/lists/man/mi Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1635 2018/12/20 07:30:00 wiz Exp $
+# $NetBSD: mi,v 1.1636 2018/12/29 11:30:11 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2441,7 +2441,7 @@
./usr/share/man/cat8/compat_darwin.0 man-obsolete obsolete
./usr/share/man/cat8/compat_freebsd.0 man-sys-catman .cat
./usr/share/man/cat8/compat_hpux.0 man-obsolete obsolete
-./usr/share/man/cat8/compat_ibcs2.0 man-sys-catman .cat
+./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
@@ -5456,7 +5456,7 @@
./usr/share/man/html8/compat_30.html man-sys-htmlman html
./usr/share/man/html8/compat_darwin.html man-obsolete obsolete
./usr/share/man/html8/compat_freebsd.html man-sys-htmlman html
-./usr/share/man/html8/compat_ibcs2.html man-sys-htmlman html
+./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
@@ -8524,7 +8524,7 @@
./usr/share/man/man8/compat_darwin.8 man-obsolete obsolete
./usr/share/man/man8/compat_freebsd.8 man-sys-man .man
./usr/share/man/man8/compat_hpux.8 man-obsolete obsolete
-./usr/share/man/man8/compat_ibcs2.8 man-sys-man .man
+./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
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.496 src/share/man/man4/options.4:1.497
--- src/share/man/man4/options.4:1.496 Thu Dec 20 10:33:41 2018
+++ src/share/man/man4/options.4 Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.496 2018/12/20 10:33:41 cherry Exp $
+.\" $NetBSD: options.4,v 1.497 2018/12/29 11:30:11 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 19, 2018
+.Dd December 29, 2018
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -440,10 +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_IBCS2
-On those architectures that support it, this enables binary
-compatibility with iBCS2 or SVR3 applications built for the same architecture.
-This is currently limited to the i386 and vax ports.
.It Cd options COMPAT_OSF1
On those architectures that support it, this enables binary
compatibility with Digital
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.134 src/share/man/man7/hier.7:1.135
--- src/share/man/man7/hier.7:1.134 Wed Dec 19 13:57:45 2018
+++ src/share/man/man7/hier.7 Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: hier.7,v 1.134 2018/12/19 13:57:45 maxv Exp $
+.\" $NetBSD: hier.7,v 1.135 2018/12/29 11:30:11 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 19, 2018
+.Dd December 29, 2018
.Dt HIER 7
.Os
.Sh NAME
@@ -884,8 +884,6 @@ binaries; see
.Xr compat_freebsd 8 .
.It Pa hpux/
Support for 68000 HP-UX binaries.
-.It Pa ibcs2/
-Support for Intel Binary binaries.
.It Pa linux/
Support for Linux binaries; see
.Xr compat_linux 8 .
Index: src/share/man/man7/symlink.7
diff -u src/share/man/man7/symlink.7:1.26 src/share/man/man7/symlink.7:1.27
--- src/share/man/man7/symlink.7:1.26 Wed Dec 19 13:57:45 2018
+++ src/share/man/man7/symlink.7 Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: symlink.7,v 1.26 2018/12/19 13:57:45 maxv Exp $
+.\" $NetBSD: symlink.7,v 1.27 2018/12/29 11:30:11 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 19, 2018
+.Dd December 29, 2018
.Dt SYMLINK 7
.Os
.Sh NAME
@@ -566,7 +566,6 @@ Other valid emulations are:
.Dv aoutm68k ,
.Dv darwin ,
.Dv freebsd ,
-.Dv ibcs2 ,
.Dv linux ,
.Dv linux32 ,
.Dv m68k4k ,
Index: src/share/man/man8/Makefile
diff -u src/share/man/man8/Makefile:1.106 src/share/man/man8/Makefile:1.107
--- src/share/man/man8/Makefile:1.106 Wed Dec 19 13:57:45 2018
+++ src/share/man/man8/Makefile Sat Dec 29 11:30:11 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.106 2018/12/19 13:57:45 maxv Exp $
+# $NetBSD: Makefile,v 1.107 2018/12/29 11:30:11 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_ibcs2.8 compat_linux.8 \
+ compat_freebsd.8 compat_linux.8 \
compat_netbsd32.8 compat_osf1.8 compat_sunos.8 \
compat_ultrix.8 diskless.8 hpcboot.8 \
intro.8 nis.8 pam.8 rc.8 rc.subr.8 rescue.8 \
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.112 src/sys/arch/amd64/conf/ALL:1.113
--- src/sys/arch/amd64/conf/ALL:1.112 Wed Dec 19 13:57:45 2018
+++ src/sys/arch/amd64/conf/ALL Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.112 2018/12/19 13:57:45 maxv Exp $
+# $NetBSD: ALL,v 1.113 2018/12/29 11:30:11 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.112 $"
+#ident "ALL-$Revision: 1.113 $"
maxusers 64 # estimated number of users
@@ -1853,7 +1853,6 @@ options DEBUG_FIND_PCIC_I82365SL_ONLY
options DEBUG_FPE
options DEBUG_GPIO
options DEBUG_GPIO2
-options DEBUG_IBCS2
options DEBUG_IPR_VJ
options DEBUG_ISAPNP
options DEBUG_ISSIGNAL
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.460 src/sys/arch/i386/conf/ALL:1.461
--- src/sys/arch/i386/conf/ALL:1.460 Fri Dec 14 22:00:26 2018
+++ src/sys/arch/i386/conf/ALL Sat Dec 29 11:30:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.460 2018/12/14 22:00:26 jakllsch Exp $
+# $NetBSD: ALL,v 1.461 2018/12/29 11:30:11 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.460 $"
+#ident "ALL-$Revision: 1.461 $"
maxusers 64 # estimated number of users
@@ -1986,7 +1986,6 @@ options DEBUG_FIND_PCIC_I82365SL_ONLY
options DEBUG_FPE
options DEBUG_GPIO
options DEBUG_GPIO2
-options DEBUG_IBCS2
options DEBUG_IPR_VJ
options DEBUG_ISAPNP
options DEBUG_ISSIGNAL
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.207 src/sys/arch/vax/conf/GENERIC:1.208
--- src/sys/arch/vax/conf/GENERIC:1.207 Sat Dec 29 09:48:54 2018
+++ src/sys/arch/vax/conf/GENERIC Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.207 2018/12/29 09:48:54 maxv Exp $
+# $NetBSD: GENERIC,v 1.208 2018/12/29 11:30:12 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.207 $"
+#ident "GENERIC-$Revision: 1.208 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -132,7 +132,6 @@ options SYSVSHM
include "conf/compat_netbsd09.config"
options COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
options COMPAT_ULTRIX
-#options COMPAT_IBCS2 # DEC SVR.3 compatibility
#options NO_INSN_EMULATE # CPU does not lack some hardware instructions.
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.27 src/sys/arch/vax/conf/VAX780:1.28
--- src/sys/arch/vax/conf/VAX780:1.27 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/vax/conf/VAX780 Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.27 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: VAX780,v 1.28 2018/12/29 11:30:12 maxv Exp $
#
# 11/780,750,730 machine description file
#
@@ -118,7 +118,6 @@ options SYSVSHM
include "conf/compat_netbsd09.config"
options COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
options COMPAT_ULTRIX # DEC Ultrix binary compatibility.
-#options COMPAT_IBCS2 # DEC SVR.3 compatibility
#options NO_INSN_EMULATE # CPU does not lack some hardware instructions.
options LKM
Index: src/sys/arch/vax/conf/files.vax
diff -u src/sys/arch/vax/conf/files.vax:1.124 src/sys/arch/vax/conf/files.vax:1.125
--- src/sys/arch/vax/conf/files.vax:1.124 Wed Apr 25 11:08:21 2018
+++ src/sys/arch/vax/conf/files.vax Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.vax,v 1.124 2018/04/25 11:08:21 ragge Exp $
+# $NetBSD: files.vax,v 1.125 2018/12/29 11:30:12 maxv Exp $
#
# new style config file for vax architecture
#
@@ -388,13 +388,9 @@ file arch/vax/vax/multicpu.c multiproce
file arch/vax/vax/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
-file arch/vax/vax/compat_13_machdep.c compat_13 | compat_ultrix |
- compat_ibcs2
+file arch/vax/vax/compat_13_machdep.c compat_13 | compat_ultrix
file arch/vax/vax/compat_16_machdep.c compat_16 | compat_ultrix
-include "compat/ibcs2/files.ibcs2"
-file arch/vax/vax/ibcs2_machdep.c compat_ibcs2
-
include "compat/ultrix/files.ultrix"
include "compat/vax1k/files.vax1k"
Index: src/sys/arch/vax/include/Makefile
diff -u src/sys/arch/vax/include/Makefile:1.29 src/sys/arch/vax/include/Makefile:1.30
--- src/sys/arch/vax/include/Makefile:1.29 Thu Jul 12 10:46:47 2018
+++ src/sys/arch/vax/include/Makefile Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/07/12 10:46:47 maxv Exp $
+# $NetBSD: Makefile,v 1.30 2018/12/29 11:30:12 maxv Exp $
INCSDIR= /usr/include/vax
@@ -8,7 +8,6 @@ INCS= ansi.h aout_machdep.h asm.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h frame.h \
- ibcs2_machdep.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
ioa.h \
ka410.h ka420.h ka43.h ka630.h ka650.h ka750.h ka820.h \
Index: src/sys/arch/vax/include/signal.h
diff -u src/sys/arch/vax/include/signal.h:1.16 src/sys/arch/vax/include/signal.h:1.17
--- src/sys/arch/vax/include/signal.h:1.16 Wed Nov 29 17:54:55 2017
+++ src/sys/arch/vax/include/signal.h Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.16 2017/11/29 17:54:55 christos Exp $ */
+/* $NetBSD: signal.h,v 1.17 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -83,7 +83,7 @@ void sendsig_context(int, const sigset_t
/* Avoid a cyclic dependency and don't use ksiginfo_t here. */
struct ksiginfo;
-#if defined(COMPAT_13) || defined(COMPAT_ULTRIX) || defined(COMPAT_IBCS2)
+#if defined(COMPAT_13) || defined(COMPAT_ULTRIX)
struct otrampframe {
unsigned sig; /* Signal number */
unsigned code; /* Info code */
@@ -95,7 +95,7 @@ struct otrampframe {
vaddr_t setupstack_oldsigcontext(const struct ksiginfo *, const sigset_t *,
int, struct lwp *, struct trapframe *, vaddr_t, int, vaddr_t);
-#endif /* COMPAT_13 || COMPAT_ULTRIX || COMPAT_IBCS2 */
+#endif /* COMPAT_13 || COMPAT_ULTRIX */
#if defined(COMPAT_16) || defined(COMPAT_ULTRIX)
struct trampoline2 {
Index: src/sys/arch/vax/vax/compat_13_machdep.c
diff -u src/sys/arch/vax/vax/compat_13_machdep.c:1.5 src/sys/arch/vax/vax/compat_13_machdep.c:1.6
--- src/sys/arch/vax/vax/compat_13_machdep.c:1.5 Thu Jul 7 06:55:39 2016
+++ src/sys/arch/vax/vax/compat_13_machdep.c Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.5 2016/07/07 06:55:39 msaitoh Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.6 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,14 +83,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.5 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.6 2018/12/29 11:30:12 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
-#include "opt_compat_ibcs2.h"
#endif
#include <sys/param.h>
Index: src/sys/arch/vax/vax/compat_16_machdep.c
diff -u src/sys/arch/vax/vax/compat_16_machdep.c:1.4 src/sys/arch/vax/vax/compat_16_machdep.c:1.5
--- src/sys/arch/vax/vax/compat_16_machdep.c:1.4 Sun Jul 3 02:18:21 2011
+++ src/sys/arch/vax/vax/compat_16_machdep.c Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.4 2011/07/03 02:18:21 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.5 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.4 2011/07/03 02:18:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.5 2018/12/29 11:30:12 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -91,7 +91,6 @@ __KERNEL_RCSID(0, "$NetBSD: compat_16_ma
#include "opt_compat_ultrix.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
-#include "opt_compat_ibcs2.h"
#endif
#include <sys/param.h>
Index: src/sys/arch/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.192 src/sys/arch/vax/vax/machdep.c:1.193
--- src/sys/arch/vax/vax/machdep.c:1.192 Sat Mar 31 06:32:47 2018
+++ src/sys/arch/vax/vax/machdep.c Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.192 2018/03/31 06:32:47 ragge Exp $ */
+/* $NetBSD: machdep.c,v 1.193 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.192 2018/03/31 06:32:47 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.193 2018/12/29 11:30:12 maxv Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -91,7 +91,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
-#include "opt_compat_ibcs2.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/vax/vax/sig_machdep.c
diff -u src/sys/arch/vax/vax/sig_machdep.c:1.23 src/sys/arch/vax/vax/sig_machdep.c:1.24
--- src/sys/arch/vax/vax/sig_machdep.c:1.23 Tue Nov 27 14:09:54 2018
+++ src/sys/arch/vax/vax/sig_machdep.c Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.23 2018/11/27 14:09:54 maxv Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.24 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -79,14 +79,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23 2018/11/27 14:09:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.24 2018/12/29 11:30:12 maxv Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
-#include "opt_compat_ibcs2.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +109,7 @@ static vaddr_t setupstack_siginfo3(const
int, struct lwp *, struct trapframe *, vaddr_t, int, vaddr_t);
const static sig_setupstack_t sig_setupstacks[] = {
-#if defined(COMPAT_13) || defined(COMPAT_ULTRIX) || defined(COMPAT_IBCS2)
+#if defined(COMPAT_13) || defined(COMPAT_ULTRIX)
setupstack_oldsigcontext, /* 0 */
setupstack_oldsigcontext, /* 1 */
#else
Index: src/sys/arch/vax/vax/subr.S
diff -u src/sys/arch/vax/vax/subr.S:1.34 src/sys/arch/vax/vax/subr.S:1.35
--- src/sys/arch/vax/vax/subr.S:1.34 Mon May 22 16:53:05 2017
+++ src/sys/arch/vax/vax/subr.S Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.S,v 1.34 2017/05/22 16:53:05 ragge Exp $ */
+/* $NetBSD: subr.S,v 1.35 2018/12/29 11:30:12 maxv Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -32,10 +32,6 @@
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#include "opt_compat_netbsd.h"
-#include "opt_compat_ibcs2.h"
-#ifdef COMPAT_IBCS2
-#include <compat/ibcs2/ibcs2_syscall.h>
-#endif
#include "opt_compat_ultrix.h"
#ifdef COMPAT_ULTRIX
#include <compat/ultrix/ultrix_syscall.h>
@@ -176,21 +172,6 @@ _C_LABEL(sigcode):
halt
_C_LABEL(esigcode):
-#ifdef COMPAT_IBCS2
- .align 2
- .globl _C_LABEL(ibcs2_sigcode),_C_LABEL(ibcs2_esigcode)
-_C_LABEL(ibcs2_sigcode):
- pushr $0x3f
- subl2 $0xc,%sp
- movl 0x24(%sp),%r0
- calls $3,(%r0)
- popr $0x3f
- chmk $SYS_compat_16___sigreturn14
- chmk $SYS_exit
- halt
-_C_LABEL(ibcs2_esigcode):
-#endif /* COMPAT_IBCS2 */
-
#ifdef COMPAT_ULTRIX
.align 2
.globl _C_LABEL(ultrix_sigcode),_C_LABEL(ultrix_esigcode)
Index: src/sys/compat/Makefile
diff -u src/sys/compat/Makefile:1.5 src/sys/compat/Makefile:1.6
--- src/sys/compat/Makefile:1.5 Tue Nov 26 23:30:30 2002
+++ src/sys/compat/Makefile Sat Dec 29 11:30:12 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/11/26 23:30:30 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/29 11:30:12 maxv Exp $
-#SUBDIR= common freebsd hpux ibcs2 linux m68k4k osf1 ossaudio sunos svr2 \
+#SUBDIR= common freebsd hpux linux m68k4k osf1 ossaudio sunos \
# ultrix netbsd32 sunos32
#INCSDIR= /usr/include/compat
Index: src/sys/compat/Makefile.syscall
diff -u src/sys/compat/Makefile.syscall:1.2 src/sys/compat/Makefile.syscall:1.3
--- src/sys/compat/Makefile.syscall:1.2 Wed Dec 19 13:57:51 2018
+++ src/sys/compat/Makefile.syscall Sat Dec 29 11:30:12 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.syscall,v 1.2 2018/12/19 13:57:51 maxv Exp $
+# $NetBSD: Makefile.syscall,v 1.3 2018/12/29 11:30:12 maxv Exp $
-SUBDIR = aoutm68k freebsd ibcs2 linux linux32 netbsd32
+SUBDIR = aoutm68k freebsd linux linux32 netbsd32
SUBDIR += osf1 sunos sunos32 ultrix
.include <bsd.subdir.mk>
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1220 src/sys/conf/files:1.1221
--- src/sys/conf/files:1.1220 Tue Dec 25 11:56:14 2018
+++ src/sys/conf/files Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1220 2018/12/25 11:56:14 mlelstv Exp $
+# $NetBSD: files,v 1.1221 2018/12/29 11:30:12 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -152,7 +152,6 @@ defflag opt_compat_netbsd.h COMPAT_10: C
defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD
defflag COMPAT_OSSAUDIO
defflag COMPAT_FREEBSD: COMPAT_30
-defflag COMPAT_IBCS2
defflag COMPAT_LINUX: COMPAT_NETBSD
defflag COMPAT_OSF1
defflag COMPAT_SUNOS: COMPAT_30
Index: src/sys/sys/ioctl.h
diff -u src/sys/sys/ioctl.h:1.37 src/sys/sys/ioctl.h:1.38
--- src/sys/sys/ioctl.h:1.37 Wed Dec 19 13:57:52 2018
+++ src/sys/sys/ioctl.h Sat Dec 29 11:30:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ioctl.h,v 1.37 2018/12/19 13:57:52 maxv Exp $ */
+/* $NetBSD: ioctl.h,v 1.38 2018/12/29 11:30:12 maxv Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -106,12 +106,10 @@ __END_DECLS
#include "opt_compat_sunos.h"
#include "opt_compat_43.h"
#include "opt_compat_osf1.h"
-#include "opt_compat_ibcs2.h"
#include "opt_modular.h"
#endif
#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS) || \
- defined(COMPAT_FREEBSD) || defined(COMPAT_OSF1) || \
- defined(COMPAT_IBCS2) || defined(MODULAR)
+ defined(COMPAT_FREEBSD) || defined(COMPAT_OSF1) || defined(MODULAR)
#include <sys/ioctl_compat.h>
#endif
