Module Name: src
Committed By: maxv
Date: Wed Aug 9 18:45:30 UTC 2017
Modified Files:
src/distrib/sets/lists/modules: md.i386
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY MODULAR NET4501 XEN3_DOM0 XEN3_DOMU files.i386
src/sys/arch/i386/i386: compat_16_machdep.c
src/sys/modules/compat_ibcs2: Makefile
Removed Files:
src/sys/arch/i386/i386: ibcs2_machdep.c ibcs2_sigcode.S ibcs2_syscall.c
Log Message:
Remove compat_ibcs2 from i386. After a discussion on port-vax, it turns
out that compat_ibcs2 does not implement the iBCS2 standard - which is
x86-specific - but rather SVR3. Our real iBCS2 implementation was a
mixture of compat_ibcs2 and compat_svr4, and was only partial. Keeping
support for this in i386 is totally irrelevant today. I also asked on
port-i386 but didn't wait long.
The main issue is that compat_ibcs2 should have been called compat_svr3.
But CVS does not support renaming files, and moving things around is both
painful and tiring, even more so when no one seems to be interested in
doing this work or in the feature at all. For now compat_ibcs2 is available
on Vax and will stay, until someone (not me) cleans it up.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.424 -r1.425 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1163 -r1.1164 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/i386/conf/GENERIC_TINY \
src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/MODULAR
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.383 -r1.384 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.44 -r0 src/sys/arch/i386/i386/ibcs2_machdep.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/i386/i386/ibcs2_sigcode.S
cvs rdiff -u -r1.49 -r0 src/sys/arch/i386/i386/ibcs2_syscall.c
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/compat_ibcs2/Makefile
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/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.74 src/distrib/sets/lists/modules/md.i386:1.75
--- src/distrib/sets/lists/modules/md.i386:1.74 Tue Aug 1 17:04:06 2017
+++ src/distrib/sets/lists/modules/md.i386 Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.74 2017/08/01 17:04:06 maya Exp $
+# $NetBSD: md.i386,v 1.75 2017/08/09 18:45:30 maxv Exp $
#
# NOTE that there are three sets of files here:
# @MODULEDIR@, i386-xen, and i386pae-xen
@@ -52,8 +52,8 @@
./@MODULEDIR@/cac_eisa/cac_eisa.kmod base-obsolete obsolete
./@MODULEDIR@/compat_freebsd base-kernel-modules kmod
./@MODULEDIR@/compat_freebsd/compat_freebsd.kmod base-kernel-modules kmod
-./@MODULEDIR@/compat_ibcs2 base-kernel-modules kmod
-./@MODULEDIR@/compat_ibcs2/compat_ibcs2.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_ibcs2 base-obsolete obsolete
+./@MODULEDIR@/compat_ibcs2/compat_ibcs2.kmod base-obsolete obsolete
./@MODULEDIR@/compat_linux base-kernel-modules kmod
./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_svr4 base-obsolete obsolete
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.424 src/sys/arch/i386/conf/ALL:1.425
--- src/sys/arch/i386/conf/ALL:1.424 Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/ALL Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.424 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: ALL,v 1.425 2017/08/09 18:45:30 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.424 $"
+#ident "ALL-$Revision: 1.425 $"
maxusers 64 # estimated number of users
@@ -148,7 +148,6 @@ options COMPAT_44 # 4.4BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_NDIS # NDIS network driver
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1163 src/sys/arch/i386/conf/GENERIC:1.1164
--- src/sys/arch/i386/conf/GENERIC:1.1163 Fri Aug 4 09:30:19 2017
+++ src/sys/arch/i386/conf/GENERIC Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1163 2017/08/04 09:30:19 maxv Exp $
+# $NetBSD: GENERIC,v 1.1164 2017/08/09 18:45:30 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1163 $"
+#ident "GENERIC-$Revision: 1.1164 $"
maxusers 64 # estimated number of users
@@ -143,7 +143,6 @@ options COMPAT_43 # 4.3BSD, 386BSD, and
#options COMPAT_386BSD_MBRPART # recognize old partition ID
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
#options COMPAT_NDIS # NDIS network driver
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.152 src/sys/arch/i386/conf/GENERIC_TINY:1.153
--- src/sys/arch/i386/conf/GENERIC_TINY:1.152 Mon Jul 31 15:43:33 2017
+++ src/sys/arch/i386/conf/GENERIC_TINY Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.152 2017/07/31 15:43:33 maxv Exp $
+# $NetBSD: GENERIC_TINY,v 1.153 2017/08/09 18:45:30 maxv Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -75,7 +75,6 @@ options COMPAT_70 # NetBSD 7.0 binary c
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.152 src/sys/arch/i386/conf/INSTALL_TINY:1.153
--- src/sys/arch/i386/conf/INSTALL_TINY:1.152 Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/INSTALL_TINY Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.152 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: INSTALL_TINY,v 1.153 2017/08/09 18:45:30 maxv Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -84,7 +84,6 @@ no options EXEC_AOUT # we don't a.out s
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.39 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.40
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.39 Sat Jul 29 18:08:58 2017
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.39 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.40 2017/08/09 18:45:30 maxv Exp $
#
# INSTALL - Installation kernel.
#
@@ -97,7 +97,6 @@ options COMPAT_70 # NetBSD 7.0 binary c
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/MODULAR
diff -u src/sys/arch/i386/conf/MODULAR:1.4 src/sys/arch/i386/conf/MODULAR:1.5
--- src/sys/arch/i386/conf/MODULAR:1.4 Sat Jul 29 12:00:56 2017
+++ src/sys/arch/i386/conf/MODULAR Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.4 2017/07/29 12:00:56 maxv Exp $
+# $NetBSD: MODULAR,v 1.5 2017/08/09 18:45:30 maxv Exp $
#
# MODULAR kernel
# This kernel config prefers loading kernel drivers from file system.
@@ -15,7 +15,6 @@ no options NFSSERVER # Network File Syst
# compatibility options, built as modules
#
no options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-no options COMPAT_IBCS2 # binary compatibility with SCO and ISC
no options COMPAT_LINUX # binary compatibility with Linux
# build non boot critical file systems as modules
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.95 src/sys/arch/i386/conf/NET4501:1.96
--- src/sys/arch/i386/conf/NET4501:1.95 Mon Jul 31 15:43:33 2017
+++ src/sys/arch/i386/conf/NET4501 Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.95 2017/07/31 15:43:33 maxv Exp $
+# $NetBSD: NET4501,v 1.96 2017/08/09 18:45:30 maxv Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.95 $"
+#ident "NET4501-$Revision: 1.96 $"
maxusers 32 # estimated number of users
@@ -95,7 +95,6 @@ options COMPAT_70 # NetBSD 7.0 binary c
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.118 src/sys/arch/i386/conf/XEN3_DOM0:1.119
--- src/sys/arch/i386/conf/XEN3_DOM0:1.118 Mon Jul 31 15:43:33 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.118 2017/07/31 15:43:33 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.119 2017/08/09 18:45:30 maxv Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -96,7 +96,6 @@ options COMPAT_70 # NetBSD 7.0 binary c
#options COMPAT_386BSD_MBRPART # recognize old partition ID
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.82 src/sys/arch/i386/conf/XEN3_DOMU:1.83
--- src/sys/arch/i386/conf/XEN3_DOMU:1.82 Mon Jul 31 15:43:33 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.82 2017/07/31 15:43:33 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.83 2017/08/09 18:45:30 maxv Exp $
include "arch/xen/conf/std.xen"
@@ -80,7 +80,6 @@ options COMPAT_70 # NetBSD 7.0 binary c
#options COMPAT_386BSD_MBRPART # recognize old partition ID
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.383 src/sys/arch/i386/conf/files.i386:1.384
--- src/sys/arch/i386/conf/files.i386:1.383 Tue Aug 1 14:43:54 2017
+++ src/sys/arch/i386/conf/files.i386 Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.383 2017/08/01 14:43:54 maxv Exp $
+# $NetBSD: files.i386,v 1.384 2017/08/09 18:45:30 maxv Exp $
#
# new style config file for i386 architecture
#
@@ -323,13 +323,7 @@ file arch/i386/i386/vm86.c vm86
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/i386/i386/compat_13_machdep.c compat_13
-file arch/i386/i386/compat_16_machdep.c compat_16 | compat_ibcs2
-
-# iBCS-2 binary compatibility (COMPAT_IBCS2)
-include "compat/ibcs2/files.ibcs2"
-file arch/i386/i386/ibcs2_machdep.c compat_ibcs2
-file arch/i386/i386/ibcs2_sigcode.S compat_ibcs2
-file arch/i386/i386/ibcs2_syscall.c compat_ibcs2
+file arch/i386/i386/compat_16_machdep.c compat_16
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
Index: src/sys/arch/i386/i386/compat_16_machdep.c
diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.26 src/sys/arch/i386/i386/compat_16_machdep.c:1.27
--- src/sys/arch/i386/i386/compat_16_machdep.c:1.26 Wed Feb 19 21:23:01 2014
+++ src/sys/arch/i386/i386/compat_16_machdep.c Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.26 2014/02/19 21:23:01 dsl Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.27 2017/08/09 18:45:30 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.26 2014/02/19 21:23:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.27 2017/08/09 18:45:30 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_vm86.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_16_ma
#include <machine/vmparam.h>
#include <x86/fpu.h>
-#if defined(COMPAT_16) || defined(COMPAT_IBCS2)
+#if defined(COMPAT_16)
#include <compat/sys/signal.h>
#include <compat/sys/signalvar.h>
Index: src/sys/modules/compat_ibcs2/Makefile
diff -u src/sys/modules/compat_ibcs2/Makefile:1.3 src/sys/modules/compat_ibcs2/Makefile:1.4
--- src/sys/modules/compat_ibcs2/Makefile:1.3 Sat Feb 14 13:56:41 2009
+++ src/sys/modules/compat_ibcs2/Makefile Wed Aug 9 18:45:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/09 18:45:30 maxv Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -15,10 +15,4 @@ SRCS+= ibcs2_exec_xout.c ibcs2_fcntl.c i
SRCS+= ibcs2_misc.c ibcs2_signal.c ibcs2_signo.c ibcs2_socksys.c
SRCS+= ibcs2_stat.c ibcs2_syscalls.c ibcs2_sysent.c ibcs2_mod.c
-.if ${MACHINE_ARCH} == "i386"
-CPPFLAGS+= -DEXEC_ELF32
-.PATH: ${S}/arch/i386/i386
-SRCS+= ibcs2_machdep.c ibcs2_syscall.c ibcs2_sigcode.S
-.endif
-
.include <bsd.kmodule.mk>
