Module Name: src
Committed By: maxv
Date: Wed Dec 19 13:57:53 UTC 2018
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: md.sparc md.sparc64
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/etc/mtree: NetBSD.dist.base
src/share/examples/emul: Makefile
src/share/man/man4: options.4
src/share/man/man7: hier.7 symlink.7
src/share/man/man8: Makefile compat_ibcs2.8
src/sys/arch/amd64/conf: ALL majors.amd64
src/sys/arch/amiga/amiga: genassym.cf locore.s
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in files.amiga
majors.amiga
src/sys/arch/amigappc/conf: majors.amigappc
src/sys/arch/atari/atari: genassym.cf locore.s
src/sys/arch/atari/conf: GENERIC.in files.atari majors.atari
src/sys/arch/bebox/conf: majors.bebox
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/dreamcast/conf: majors.dreamcast
src/sys/arch/evbcf/conf: majors.evbcf
src/sys/arch/evbmips/conf: CPMBR1400 LINKITSMART7688 MALTA ZYXELKX
src/sys/arch/hp300/conf: GENERIC files.hp300 majors.hp300
src/sys/arch/hp300/hp300: genassym.cf locore.s
src/sys/arch/i386/conf: majors.i386
src/sys/arch/ia64/conf: majors.ia64
src/sys/arch/ibmnws/conf: majors.ibmnws
src/sys/arch/luna68k/luna68k: genassym.cf locore.s
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/m68k: m68k_syscall.c
src/sys/arch/mac68k/conf: GENERIC files.mac68k majors.mac68k
src/sys/arch/mac68k/mac68k: genassym.cf locore.s
src/sys/arch/mvme68k/conf: files.mvme68k majors.mvme68k
src/sys/arch/mvme68k/mvme68k: genassym.cf locore.s
src/sys/arch/mvmeppc/conf: majors.mvmeppc
src/sys/arch/news68k/conf: GENERIC GENERIC_TINY LIBERO NEWS1200
files.news68k majors.news68k
src/sys/arch/news68k/news68k: genassym.cf locore.s
src/sys/arch/next68k/conf: GENERIC SLAB files.next68k majors.next68k
src/sys/arch/next68k/next68k: genassym.cf locore.s
src/sys/arch/sgimips/conf: majors.sgimips
src/sys/arch/sparc/conf: GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX
files.sparc majors.sparc
src/sys/arch/sparc/include: trap.h
src/sys/arch/sparc/sparc: locore.s sigcode_state.s trap.c
src/sys/arch/sparc64/conf: GENERIC GENERIC32 NONPLUS NONPLUS64
files.sparc64 majors.sparc64
src/sys/arch/sparc64/include: Makefile trap.h
src/sys/arch/sparc64/sparc64: machdep.c trap.c
src/sys/arch/sun2/conf: files.sun2 majors.sun2
src/sys/arch/sun2/sun2: genassym.cf locore.s
src/sys/arch/sun3/conf: DISKLESS GENERIC GENERIC3X files.sun3
majors.sun3
src/sys/arch/sun3/sun3: genassym.cf locore.s
src/sys/arch/sun3/sun3x: genassym.cf locore.s
src/sys/arch/x68k/conf: GENERIC INSTALL files.x68k majors.x68k
src/sys/arch/x68k/x68k: genassym.cf locore.s
src/sys/compat: Makefile.syscall
src/sys/compat/sunos: sunos_dirent.h
src/sys/compat/sys: socket.h
src/sys/conf: files
src/sys/modules: Makefile
src/sys/rump/librump/rumpkern: devsw.c
src/sys/sys: ioctl.h
Removed Files:
src/share/examples/emul/svr4: Makefile
src/share/examples/emul/svr4/etc: Makefile SVR4_MAKEDEV netconfig
nsswitch.conf
src/share/man/man8: compat_svr4.8
src/sys/arch/amiga/include: svr4_machdep.h
src/sys/arch/atari/include: svr4_machdep.h
src/sys/arch/cesfic/include: svr4_machdep.h
src/sys/arch/evbcf/include: svr4_machdep.h
src/sys/arch/hp300/include: svr4_machdep.h
src/sys/arch/luna68k/include: svr4_machdep.h
src/sys/arch/m68k/include: svr4_machdep.h
src/sys/arch/m68k/m68k: svr4_machdep.c svr4_sigcode.s svr4_syscall.c
src/sys/arch/mac68k/include: svr4_machdep.h
src/sys/arch/mips/include: svr4_machdep.h
src/sys/arch/mips/mips: svr4_machdep.c
src/sys/arch/mvme68k/include: svr4_machdep.h
src/sys/arch/news68k/include: svr4_machdep.h
src/sys/arch/next68k/include: svr4_machdep.h
src/sys/arch/sgimips/include: svr4_machdep.h
src/sys/arch/sparc/include: svr4_machdep.h
src/sys/arch/sparc/sparc: svr4_machdep.c svr4_sigcode.s
src/sys/arch/sparc64/include: svr4_32_machdep.h svr4_machdep.h
src/sys/arch/sparc64/sparc64: svr4_32_machdep.c svr4_32_sigcode.s
svr4_machdep.c svr4_sigcode64.s
src/sys/arch/sun3/include: svr4_machdep.h
src/sys/arch/x68k/include: svr4_machdep.h
src/sys/compat/svr4: Makefile files.svr4 svr4_acl.h svr4_dirent.h
svr4_errno.c svr4_errno.h svr4_exec.c svr4_exec.h svr4_exec_elf32.c
svr4_exec_elf64.c svr4_fcntl.c svr4_fcntl.h svr4_filio.c
svr4_filio.h svr4_fuser.h svr4_hrt.h svr4_ioctl.c svr4_ioctl.h
svr4_ipc.c svr4_ipc.h svr4_lwp.c svr4_lwp.h svr4_misc.c svr4_mman.h
svr4_mod.c svr4_net.c svr4_resource.c svr4_resource.h
svr4_schedctl.c svr4_schedctl.h svr4_siginfo.h svr4_signal.c
svr4_signal.h svr4_signo.c svr4_socket.c svr4_socket.h
svr4_sockio.c svr4_sockio.h svr4_sockmod.h svr4_stat.c svr4_stat.h
svr4_statvfs.h svr4_stream.c svr4_stropts.h svr4_syscall.h
svr4_syscallargs.h svr4_syscalls.c svr4_sysconfig.h svr4_sysent.c
svr4_systeminfo.h svr4_termios.c svr4_termios.h svr4_time.h
svr4_timod.h svr4_ttold.c svr4_ttold.h svr4_types.h svr4_ucontext.h
svr4_ulimit.h svr4_ustat.h svr4_util.h svr4_utsname.h svr4_wait.h
syscalls.conf syscalls.master
src/sys/compat/svr4_32: Makefile files.svr4_32 sed.script svr4_32_acl.h
svr4_32_dirent.h svr4_32_exec.c svr4_32_exec.h svr4_32_exec_elf32.c
svr4_32_fcntl.c svr4_32_fcntl.h svr4_32_filio.c svr4_32_fuser.h
svr4_32_hrt.h svr4_32_ioctl.c svr4_32_ioctl.h svr4_32_ipc.c
svr4_32_ipc.h svr4_32_lwp.c svr4_32_lwp.h svr4_32_misc.c
svr4_32_mod.c svr4_32_net.c svr4_32_resource.c svr4_32_resource.h
svr4_32_schedctl.c svr4_32_schedctl.h svr4_32_siginfo.h
svr4_32_signal.c svr4_32_signal.h svr4_32_socket.c svr4_32_socket.h
svr4_32_sockio.c svr4_32_sockio.h svr4_32_stat.c svr4_32_stat.h
svr4_32_statvfs.h svr4_32_stream.c svr4_32_stropts.h
svr4_32_syscall.h svr4_32_syscallargs.h svr4_32_syscalls.c
svr4_32_sysent.c svr4_32_termios.c svr4_32_termios.h svr4_32_time.h
svr4_32_timod.h svr4_32_types.h svr4_32_ucontext.h svr4_32_ustat.h
svr4_32_util.h syscalls.conf syscalls.master
src/sys/modules/compat_svr4: Makefile
Log Message:
Remove compat_svr4 and compat_svr4_32, as discussed on tech-kern@ recently,
but also as discussed several times in the past.
To generate a diff of this commit:
cvs rdiff -u -r1.1194 -r1.1195 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1632 -r1.1633 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.180 -r1.181 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.2 -r1.3 src/share/examples/emul/Makefile
cvs rdiff -u -r1.1 -r0 src/share/examples/emul/svr4/Makefile
cvs rdiff -u -r1.5 -r0 src/share/examples/emul/svr4/etc/Makefile
cvs rdiff -u -r1.10 -r0 src/share/examples/emul/svr4/etc/SVR4_MAKEDEV
cvs rdiff -u -r1.1 -r0 src/share/examples/emul/svr4/etc/netconfig \
src/share/examples/emul/svr4/etc/nsswitch.conf
cvs rdiff -u -r1.492 -r1.493 src/share/man/man4/options.4
cvs rdiff -u -r1.133 -r1.134 src/share/man/man7/hier.7
cvs rdiff -u -r1.25 -r1.26 src/share/man/man7/symlink.7
cvs rdiff -u -r1.105 -r1.106 src/share/man/man8/Makefile
cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/compat_ibcs2.8
cvs rdiff -u -r1.29 -r0 src/share/man/man8/compat_svr4.8
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/conf/majors.amd64
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.187 -r1.188 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.321 -r1.322 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/conf/majors.amiga
cvs rdiff -u -r1.3 -r0 src/sys/arch/amiga/include/svr4_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amigappc/conf/majors.amigappc
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/atari/conf/files.atari
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/atari/conf/majors.atari
cvs rdiff -u -r1.3 -r0 src/sys/arch/atari/include/svr4_machdep.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/bebox/conf/majors.bebox
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.1 -r0 src/sys/arch/cesfic/include/svr4_machdep.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/dreamcast/conf/majors.dreamcast
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/conf/majors.evbcf
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbcf/include/svr4_machdep.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbmips/conf/CPMBR1400
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/conf/ZYXELKX
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hp300/conf/majors.hp300
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.3 -r0 src/sys/arch/hp300/include/svr4_machdep.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/conf/majors.i386
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/conf/majors.ia64
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ibmnws/conf/majors.ibmnws
cvs rdiff -u -r1.1 -r0 src/sys/arch/luna68k/include/svr4_machdep.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.5 -r0 src/sys/arch/m68k/include/svr4_machdep.h
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/m68k/m68k/m68k_syscall.c
cvs rdiff -u -r1.33 -r0 src/sys/arch/m68k/m68k/svr4_machdep.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/m68k/m68k/svr4_sigcode.s
cvs rdiff -u -r1.4 -r0 src/sys/arch/m68k/m68k/svr4_syscall.c
cvs rdiff -u -r1.226 -r1.227 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/mac68k/conf/files.mac68k
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mac68k/conf/majors.mac68k
cvs rdiff -u -r1.3 -r0 src/sys/arch/mac68k/include/svr4_machdep.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.6 -r0 src/sys/arch/mips/include/svr4_machdep.h
cvs rdiff -u -r1.16 -r0 src/sys/arch/mips/mips/svr4_machdep.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mvme68k/conf/files.mvme68k
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mvme68k/conf/majors.mvme68k
cvs rdiff -u -r1.3 -r0 src/sys/arch/mvme68k/include/svr4_machdep.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mvmeppc/conf/majors.mvmeppc
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/news68k/conf/GENERIC_TINY
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/news68k/conf/LIBERO \
src/sys/arch/news68k/conf/NEWS1200
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/news68k/conf/files.news68k
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/news68k/conf/majors.news68k
cvs rdiff -u -r1.1 -r0 src/sys/arch/news68k/include/svr4_machdep.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/next68k/conf/SLAB
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/next68k/conf/files.next68k
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/next68k/conf/majors.next68k
cvs rdiff -u -r1.3 -r0 src/sys/arch/next68k/include/svr4_machdep.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sgimips/conf/majors.sgimips
cvs rdiff -u -r1.2 -r0 src/sys/arch/sgimips/include/svr4_machdep.h
cvs rdiff -u -r1.261 -r1.262 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/sparc/conf/files.sparc
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/conf/majors.sparc
cvs rdiff -u -r1.13 -r0 src/sys/arch/sparc/include/svr4_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/include/trap.h
cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc/sparc/locore.s
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc/sparc/sigcode_state.s
cvs rdiff -u -r1.71 -r0 src/sys/arch/sparc/sparc/svr4_machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/sparc/sparc/svr4_sigcode.s
cvs rdiff -u -r1.196 -r1.197 src/sys/arch/sparc/sparc/trap.c
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/sparc64/conf/GENERIC32
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/conf/NONPLUS
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/conf/NONPLUS64
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sparc64/conf/majors.sparc64
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sparc64/include/Makefile
cvs rdiff -u -r1.9 -r0 src/sys/arch/sparc64/include/svr4_32_machdep.h
cvs rdiff -u -r1.12 -r0 src/sys/arch/sparc64/include/svr4_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/include/trap.h
cvs rdiff -u -r1.289 -r1.290 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.41 -r0 src/sys/arch/sparc64/sparc64/svr4_32_machdep.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/sparc64/sparc64/svr4_32_sigcode.s
cvs rdiff -u -r1.56 -r0 src/sys/arch/sparc64/sparc64/svr4_machdep.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/sparc64/sparc64/svr4_sigcode64.s
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/sparc64/trap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun2/conf/files.sun2 \
src/sys/arch/sun2/conf/majors.sun2
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sun2/sun2/genassym.cf
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun3/conf/DISKLESS
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sun3/conf/files.sun3
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun3/conf/majors.sun3
cvs rdiff -u -r1.3 -r0 src/sys/arch/sun3/include/svr4_machdep.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun3/sun3/genassym.cf
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sun3/sun3x/genassym.cf
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/x68k/conf/INSTALL
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x68k/conf/majors.x68k
cvs rdiff -u -r1.3 -r0 src/sys/arch/x68k/include/svr4_machdep.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x68k/x68k/genassym.cf
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/x68k/x68k/locore.s
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/Makefile.syscall
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sunos/sunos_dirent.h
cvs rdiff -u -r1.6 -r0 src/sys/compat/svr4/Makefile \
src/sys/compat/svr4/svr4_siginfo.h src/sys/compat/svr4/svr4_socket.h \
src/sys/compat/svr4/svr4_ttold.h src/sys/compat/svr4/svr4_ulimit.h
cvs rdiff -u -r1.18 -r0 src/sys/compat/svr4/files.svr4 \
src/sys/compat/svr4/svr4_resource.c
cvs rdiff -u -r1.5 -r0 src/sys/compat/svr4/svr4_acl.h \
src/sys/compat/svr4/svr4_fuser.h src/sys/compat/svr4/svr4_hrt.h \
src/sys/compat/svr4/svr4_ipc.h src/sys/compat/svr4/svr4_sysconfig.h \
src/sys/compat/svr4/svr4_ustat.h src/sys/compat/svr4/svr4_utsname.h
cvs rdiff -u -r1.7 -r0 src/sys/compat/svr4/svr4_dirent.h \
src/sys/compat/svr4/svr4_sockmod.h src/sys/compat/svr4/svr4_systeminfo.h \
src/sys/compat/svr4/svr4_termios.h src/sys/compat/svr4/svr4_time.h \
src/sys/compat/svr4/svr4_wait.h src/sys/compat/svr4/syscalls.conf
cvs rdiff -u -r1.11 -r0 src/sys/compat/svr4/svr4_errno.c \
src/sys/compat/svr4/svr4_ioctl.h
cvs rdiff -u -r1.8 -r0 src/sys/compat/svr4/svr4_errno.h \
src/sys/compat/svr4/svr4_schedctl.c src/sys/compat/svr4/svr4_timod.h
cvs rdiff -u -r1.69 -r0 src/sys/compat/svr4/svr4_exec.c
cvs rdiff -u -r1.29 -r0 src/sys/compat/svr4/svr4_exec.h \
src/sys/compat/svr4/svr4_termios.c
cvs rdiff -u -r1.15 -r0 src/sys/compat/svr4/svr4_exec_elf32.c \
src/sys/compat/svr4/svr4_exec_elf64.c
cvs rdiff -u -r1.74 -r0 src/sys/compat/svr4/svr4_fcntl.c
cvs rdiff -u -r1.9 -r0 src/sys/compat/svr4/svr4_fcntl.h \
src/sys/compat/svr4/svr4_sockio.h src/sys/compat/svr4/svr4_ucontext.h
cvs rdiff -u -r1.24 -r0 src/sys/compat/svr4/svr4_filio.c
cvs rdiff -u -r1.4 -r0 src/sys/compat/svr4/svr4_filio.h \
src/sys/compat/svr4/svr4_mman.h src/sys/compat/svr4/svr4_mod.c \
src/sys/compat/svr4/svr4_statvfs.h
cvs rdiff -u -r1.37 -r0 src/sys/compat/svr4/svr4_ioctl.c
cvs rdiff -u -r1.27 -r0 src/sys/compat/svr4/svr4_ipc.c
cvs rdiff -u -r1.20 -r0 src/sys/compat/svr4/svr4_lwp.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/svr4/svr4_lwp.h \
src/sys/compat/svr4/svr4_resource.h
cvs rdiff -u -r1.159 -r0 src/sys/compat/svr4/svr4_misc.c
cvs rdiff -u -r1.62 -r0 src/sys/compat/svr4/svr4_net.c \
src/sys/compat/svr4/syscalls.master
cvs rdiff -u -r1.3 -r0 src/sys/compat/svr4/svr4_schedctl.h \
src/sys/compat/svr4/svr4_signo.c
cvs rdiff -u -r1.67 -r0 src/sys/compat/svr4/svr4_signal.c
cvs rdiff -u -r1.32 -r0 src/sys/compat/svr4/svr4_signal.h
cvs rdiff -u -r1.23 -r0 src/sys/compat/svr4/svr4_socket.c
cvs rdiff -u -r1.39 -r0 src/sys/compat/svr4/svr4_sockio.c
cvs rdiff -u -r1.71 -r0 src/sys/compat/svr4/svr4_stat.c
cvs rdiff -u -r1.10 -r0 src/sys/compat/svr4/svr4_stat.h
cvs rdiff -u -r1.94 -r0 src/sys/compat/svr4/svr4_stream.c \
src/sys/compat/svr4/svr4_sysent.c
cvs rdiff -u -r1.14 -r0 src/sys/compat/svr4/svr4_stropts.h \
src/sys/compat/svr4/svr4_types.h
cvs rdiff -u -r1.91 -r0 src/sys/compat/svr4/svr4_syscall.h \
src/sys/compat/svr4/svr4_syscalls.c
cvs rdiff -u -r1.90 -r0 src/sys/compat/svr4/svr4_syscallargs.h
cvs rdiff -u -r1.34 -r0 src/sys/compat/svr4/svr4_ttold.c
cvs rdiff -u -r1.13 -r0 src/sys/compat/svr4/svr4_util.h
cvs rdiff -u -r1.7 -r0 src/sys/compat/svr4_32/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/compat/svr4_32/files.svr4_32 \
src/sys/compat/svr4_32/svr4_32_ipc.h \
src/sys/compat/svr4_32/svr4_32_schedctl.c \
src/sys/compat/svr4_32/svr4_32_sockio.h \
src/sys/compat/svr4_32/svr4_32_types.h
cvs rdiff -u -r1.2 -r0 src/sys/compat/svr4_32/sed.script \
src/sys/compat/svr4_32/svr4_32_statvfs.h \
src/sys/compat/svr4_32/svr4_32_time.h \
src/sys/compat/svr4_32/svr4_32_util.h
cvs rdiff -u -r1.4 -r0 src/sys/compat/svr4_32/svr4_32_acl.h \
src/sys/compat/svr4_32/svr4_32_dirent.h \
src/sys/compat/svr4_32/svr4_32_fcntl.h \
src/sys/compat/svr4_32/svr4_32_fuser.h \
src/sys/compat/svr4_32/svr4_32_hrt.h src/sys/compat/svr4_32/svr4_32_lwp.h \
src/sys/compat/svr4_32/svr4_32_resource.h \
src/sys/compat/svr4_32/svr4_32_siginfo.h \
src/sys/compat/svr4_32/svr4_32_stat.h \
src/sys/compat/svr4_32/svr4_32_termios.h \
src/sys/compat/svr4_32/svr4_32_timod.h \
src/sys/compat/svr4_32/svr4_32_ustat.h
cvs rdiff -u -r1.30 -r0 src/sys/compat/svr4_32/svr4_32_exec.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/svr4_32/svr4_32_exec.h
cvs rdiff -u -r1.24 -r0 src/sys/compat/svr4_32/svr4_32_exec_elf32.c \
src/sys/compat/svr4_32/svr4_32_net.c
cvs rdiff -u -r1.36 -r0 src/sys/compat/svr4_32/svr4_32_fcntl.c \
src/sys/compat/svr4_32/svr4_32_stat.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/svr4_32/svr4_32_filio.c \
src/sys/compat/svr4_32/svr4_32_lwp.c \
src/sys/compat/svr4_32/svr4_32_resource.c
cvs rdiff -u -r1.23 -r0 src/sys/compat/svr4_32/svr4_32_ioctl.c \
src/sys/compat/svr4_32/svr4_32_sockio.c
cvs rdiff -u -r1.5 -r0 src/sys/compat/svr4_32/svr4_32_ioctl.h \
src/sys/compat/svr4_32/svr4_32_schedctl.h \
src/sys/compat/svr4_32/svr4_32_socket.h \
src/sys/compat/svr4_32/svr4_32_stropts.h
cvs rdiff -u -r1.20 -r0 src/sys/compat/svr4_32/svr4_32_ipc.c \
src/sys/compat/svr4_32/syscalls.master
cvs rdiff -u -r1.80 -r0 src/sys/compat/svr4_32/svr4_32_misc.c
cvs rdiff -u -r1.3 -r0 src/sys/compat/svr4_32/svr4_32_mod.c
cvs rdiff -u -r1.31 -r0 src/sys/compat/svr4_32/svr4_32_signal.c
cvs rdiff -u -r1.12 -r0 src/sys/compat/svr4_32/svr4_32_signal.h
cvs rdiff -u -r1.13 -r0 src/sys/compat/svr4_32/svr4_32_socket.c
cvs rdiff -u -r1.25 -r0 src/sys/compat/svr4_32/svr4_32_stream.c
cvs rdiff -u -r1.28 -r0 src/sys/compat/svr4_32/svr4_32_syscall.h \
src/sys/compat/svr4_32/svr4_32_syscallargs.h \
src/sys/compat/svr4_32/svr4_32_syscalls.c
cvs rdiff -u -r1.29 -r0 src/sys/compat/svr4_32/svr4_32_sysent.c
cvs rdiff -u -r1.18 -r0 src/sys/compat/svr4_32/svr4_32_termios.c
cvs rdiff -u -r1.9 -r0 src/sys/compat/svr4_32/svr4_32_ucontext.h
cvs rdiff -u -r1.1 -r0 src/sys/compat/svr4_32/syscalls.conf
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/sys/socket.h
cvs rdiff -u -r1.1218 -r1.1219 src/sys/conf/files
cvs rdiff -u -r1.213 -r1.214 src/sys/modules/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/modules/compat_svr4/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/devsw.c
cvs rdiff -u -r1.36 -r1.37 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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1194 src/distrib/sets/lists/base/mi:1.1195
--- src/distrib/sets/lists/base/mi:1.1194 Wed Dec 12 07:04:05 2018
+++ src/distrib/sets/lists/base/mi Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1194 2018/12/12 07:04:05 maxv Exp $
+# $NetBSD: mi,v 1.1195 2018/12/19 13:57:44 maxv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2217,8 +2217,8 @@
./usr/share/examples/emul base-sys-examples
./usr/share/examples/emul/linux base-sys-examples
./usr/share/examples/emul/linux/etc base-sys-examples
-./usr/share/examples/emul/svr4 base-sys-examples
-./usr/share/examples/emul/svr4/etc base-sys-examples
+./usr/share/examples/emul/svr4 base-obsolete obsolete
+./usr/share/examples/emul/svr4/etc base-obsolete obsolete
./usr/share/examples/emul/ultrix base-sys-examples
./usr/share/examples/emul/ultrix/etc base-sys-examples
./usr/share/examples/fstab base-fstab-examples
Index: src/distrib/sets/lists/comp/md.sparc
diff -u src/distrib/sets/lists/comp/md.sparc:1.94 src/distrib/sets/lists/comp/md.sparc:1.95
--- src/distrib/sets/lists/comp/md.sparc:1.94 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.sparc Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.94 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.sparc,v 1.95 2018/12/19 13:57:44 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-4.8/visintrin.h comp-c-include obsolete
@@ -141,7 +141,7 @@
./usr/include/sparc64/sljit_machdep.h comp-c-include
./usr/include/sparc64/sljitarch.h comp-obsolete obsolete
./usr/include/sparc64/stdarg.h comp-obsolete obsolete
-./usr/include/sparc64/svr4_machdep.h comp-c-include
+./usr/include/sparc64/svr4_machdep.h comp-obsolete obsolete
./usr/include/sparc64/trap.h comp-c-include
./usr/include/sparc64/types.h comp-c-include
./usr/include/sparc64/varargs.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.201 src/distrib/sets/lists/comp/md.sparc64:1.202
--- src/distrib/sets/lists/comp/md.sparc64:1.201 Thu Jul 12 10:46:40 2018
+++ src/distrib/sets/lists/comp/md.sparc64 Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.201 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: md.sparc64,v 1.202 2018/12/19 13:57:44 maxv Exp $
./usr/include/g++/bits/sparc comp-c-include compat
./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc,compat
./usr/include/g++/bits/sparc64 comp-c-include compat
@@ -144,7 +144,7 @@
./usr/include/sparc64/sljit_machdep.h comp-c-include
./usr/include/sparc64/sljitarch.h comp-obsolete obsolete
./usr/include/sparc64/stdarg.h comp-obsolete obsolete
-./usr/include/sparc64/svr4_machdep.h comp-c-include
+./usr/include/sparc64/svr4_machdep.h comp-obsolete obsolete
./usr/include/sparc64/trap.h comp-c-include
./usr/include/sparc64/types.h comp-c-include
./usr/include/sparc64/varargs.h comp-obsolete obsolete
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1632 src/distrib/sets/lists/man/mi:1.1633
--- src/distrib/sets/lists/man/mi:1.1632 Wed Dec 12 08:20:53 2018
+++ src/distrib/sets/lists/man/mi Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1632 2018/12/12 08:20:53 maxv Exp $
+# $NetBSD: mi,v 1.1633 2018/12/19 13:57:44 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2449,8 +2449,8 @@
./usr/share/man/cat8/compat_sco.0 man-sys-catman .cat
./usr/share/man/cat8/compat_solaris.0 man-sys-catman .cat
./usr/share/man/cat8/compat_sunos.0 man-sys-catman .cat
-./usr/share/man/cat8/compat_svr4.0 man-sys-catman .cat
-./usr/share/man/cat8/compat_svr4_32.0 man-sys-catman .cat
+./usr/share/man/cat8/compat_svr4.0 man-obsolete obsolete
+./usr/share/man/cat8/compat_svr4_32.0 man-obsolete obsolete
./usr/share/man/cat8/compat_ultrix.0 man-sys-catman .cat
./usr/share/man/cat8/compat_win32.0 man-obsolete obsolete
./usr/share/man/cat8/compat_xenix.0 man-sys-catman .cat
@@ -5464,8 +5464,8 @@
./usr/share/man/html8/compat_sco.html man-sys-htmlman html
./usr/share/man/html8/compat_solaris.html man-sys-htmlman html
./usr/share/man/html8/compat_sunos.html man-sys-htmlman html
-./usr/share/man/html8/compat_svr4.html man-sys-htmlman html
-./usr/share/man/html8/compat_svr4_32.html man-sys-htmlman html
+./usr/share/man/html8/compat_svr4.html man-obsolete obsolete
+./usr/share/man/html8/compat_svr4_32.html man-obsolete obsolete
./usr/share/man/html8/compat_ultrix.html man-sys-htmlman html
./usr/share/man/html8/compat_win32.html man-obsolete obsolete
./usr/share/man/html8/compat_xenix.html man-sys-htmlman html
@@ -8532,8 +8532,8 @@
./usr/share/man/man8/compat_sco.8 man-sys-man .man
./usr/share/man/man8/compat_solaris.8 man-sys-man .man
./usr/share/man/man8/compat_sunos.8 man-sys-man .man
-./usr/share/man/man8/compat_svr4.8 man-sys-man .man
-./usr/share/man/man8/compat_svr4_32.8 man-sys-man .man
+./usr/share/man/man8/compat_svr4.8 man-obsolete obsolete
+./usr/share/man/man8/compat_svr4_32.8 man-obsolete obsolete
./usr/share/man/man8/compat_ultrix.8 man-sys-man .man
./usr/share/man/man8/compat_win32.8 man-obsolete obsolete
./usr/share/man/man8/compat_xenix.8 man-sys-man .man
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.209 src/distrib/sets/lists/misc/mi:1.210
--- src/distrib/sets/lists/misc/mi:1.209 Fri Nov 9 21:33:50 2018
+++ src/distrib/sets/lists/misc/mi Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.209 2018/11/09 21:33:50 abs Exp $
+# $NetBSD: mi,v 1.210 2018/12/19 13:57:44 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1369,9 +1369,9 @@
./usr/share/examples/dhcpcd/hooks/50-ypbind misc-dhcpcd-examples share
./usr/share/examples/disktab/disktab misc-sys-examples share
./usr/share/examples/emul/linux/etc/LINUX_MAKEDEV misc-sys-examples share
-./usr/share/examples/emul/svr4/etc/SVR4_MAKEDEV misc-sys-examples share
-./usr/share/examples/emul/svr4/etc/netconfig misc-sys-examples share
-./usr/share/examples/emul/svr4/etc/nsswitch.conf misc-sys-examples share
+./usr/share/examples/emul/svr4/etc/SVR4_MAKEDEV misc-obsolete obsolete
+./usr/share/examples/emul/svr4/etc/netconfig misc-obsolete obsolete
+./usr/share/examples/emul/svr4/etc/nsswitch.conf misc-obsolete obsolete
./usr/share/examples/emul/ultrix/etc/svc.conf misc-sys-examples share
./usr/share/examples/fstab/fstab.cdrom misc-fstab-examples share
./usr/share/examples/fstab/fstab.md misc-obsolete obsolete
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.180 src/etc/mtree/NetBSD.dist.base:1.181
--- src/etc/mtree/NetBSD.dist.base:1.180 Fri Nov 9 21:33:50 2018
+++ src/etc/mtree/NetBSD.dist.base Wed Dec 19 13:57:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.180 2018/11/09 21:33:50 abs Exp $
+# $NetBSD: NetBSD.dist.base,v 1.181 2018/12/19 13:57:44 maxv Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -365,8 +365,6 @@
./usr/share/examples/emul
./usr/share/examples/emul/linux
./usr/share/examples/emul/linux/etc
-./usr/share/examples/emul/svr4
-./usr/share/examples/emul/svr4/etc
./usr/share/examples/emul/ultrix
./usr/share/examples/emul/ultrix/etc
./usr/share/examples/fstab
Index: src/share/examples/emul/Makefile
diff -u src/share/examples/emul/Makefile:1.2 src/share/examples/emul/Makefile:1.3
--- src/share/examples/emul/Makefile:1.2 Fri Sep 22 15:33:08 2006
+++ src/share/examples/emul/Makefile Wed Dec 19 13:57:45 2018
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2006/09/22 15:33:08 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/12/19 13:57:45 maxv Exp $
-SUBDIR= linux svr4 ultrix
+SUBDIR= linux ultrix
.include <bsd.subdir.mk>
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.492 src/share/man/man4/options.4:1.493
--- src/share/man/man4/options.4:1.492 Sat Dec 15 12:08:18 2018
+++ src/share/man/man4/options.4 Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.492 2018/12/15 12:08:18 maxv Exp $
+.\" $NetBSD: options.4,v 1.493 2018/12/19 13:57:45 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 15, 2018
+.Dd December 19, 2018
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -411,12 +411,6 @@ to find and use ptys named
Eventually this option will become optional as ptyfs based pseudo-ttys become
the default, see
.Xr mount_ptyfs 8 .
-.It Cd options COMPAT_SVR4
-On those architectures that support it, this enables binary
-compatibility with
-.At V.4
-applications built for the same architecture.
-This currently includes the m68k and sparc ports.
.It Cd options COMPAT_LINUX
On those architectures that support it, this enables binary
compatibility with Linux ELF and
@@ -472,11 +466,6 @@ On those architectures that support it,
compatibility with 32-bit applications built for the same architecture.
This is currently limited to the amd64 and sparc64 ports, and only
applicable for 64-bit kernels.
-.It Cd options COMPAT_SVR4_32
-On those architectures that support it, this enables binary
-compatibility with 32-bit SVR4 applications built for the same architecture.
-This is currently limited to the sparc64 port, and only applicable for
-64-bit kernels.
.It Cd options COMPAT_AOUT_M68K
On m68k architectures which have switched to ELF,
this enables binary compatibility with
@@ -2629,11 +2618,6 @@ handling happens.
.It Cd options DEBUG_EMUL
Adds debugging messages calls for emulated floating point and
alignment fixing operations.
-.It Cd options DEBUG_SVR4
-Prints registers messages calls for emulated SVR4 getcontext and
-setcontext operations.
-See
-.Em options COMPAT_SVR4 .
.It Cd options EXTREME_DEBUG
Adds debugging functions callable from
.Xr ddb 4 .
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.133 src/share/man/man7/hier.7:1.134
--- src/share/man/man7/hier.7:1.133 Thu Sep 6 10:09:29 2018
+++ src/share/man/man7/hier.7 Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: hier.7,v 1.133 2018/09/06 10:09:29 maxv Exp $
+.\" $NetBSD: hier.7,v 1.134 2018/12/19 13:57:45 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 September 6, 2018
+.Dd December 19, 2018
.Dt HIER 7
.Os
.Sh NAME
@@ -904,9 +904,6 @@ Support for OSS audio.
.It Pa sunos/
Support for SunOS 4.x binaries; see
.Xr compat_sunos 8 .
-.It Pa svr4/
-Support for System V Release 4 binaries; see
-.Xr compat_svr4 8 .
.It Pa ultrix/
Support for ULTRIX binaries.
.It Pa vax1k/
Index: src/share/man/man7/symlink.7
diff -u src/share/man/man7/symlink.7:1.25 src/share/man/man7/symlink.7:1.26
--- src/share/man/man7/symlink.7:1.25 Mon Apr 24 09:42:19 2017
+++ src/share/man/man7/symlink.7 Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: symlink.7,v 1.25 2017/04/24 09:42:19 wiz Exp $
+.\" $NetBSD: symlink.7,v 1.26 2018/12/19 13:57:45 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 April 21, 2017
+.Dd December 19, 2018
.Dt SYMLINK 7
.Os
.Sh NAME
@@ -574,8 +574,6 @@ Other valid emulations are:
.Dv osf1 ,
.Dv sunos ,
.Dv sunos32 ,
-.Dv svr4 ,
-.Dv svr4_32 ,
.Dv ultrix ,
.Dv vax1k .
.It @kernel_ident
Index: src/share/man/man8/Makefile
diff -u src/share/man/man8/Makefile:1.105 src/share/man/man8/Makefile:1.106
--- src/share/man/man8/Makefile:1.105 Wed Jan 24 09:04:42 2018
+++ src/share/man/man8/Makefile Wed Dec 19 13:57:45 2018
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.105 2018/01/24 09:04:42 skrll Exp $
+# $NetBSD: Makefile,v 1.106 2018/12/19 13:57:45 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_netbsd32.8 compat_osf1.8 compat_sunos.8 \
- compat_svr4.8 compat_ultrix.8 diskless.8 hpcboot.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 \
wizd.8
MLINKS+=MAKEDEV.8 makedev.8
MLINKS+=MAKEDEV.local.8 makedev.local.8
-MLINKS+=compat_svr4.8 compat_sco.8
-MLINKS+=compat_svr4.8 compat_solaris.8
-MLINKS+=compat_svr4.8 compat_svr4_32.8
-MLINKS+=compat_svr4.8 compat_xenix.8
MLINKS+=compat_netbsd32.8 netbsd32.8
MLINKS+=nis.8 yp.8
MLINKS+=rc.8 rc.d.8
Index: src/share/man/man8/compat_ibcs2.8
diff -u src/share/man/man8/compat_ibcs2.8:1.10 src/share/man/man8/compat_ibcs2.8:1.11
--- src/share/man/man8/compat_ibcs2.8:1.10 Sat Aug 12 08:45:58 2017
+++ src/share/man/man8/compat_ibcs2.8 Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: compat_ibcs2.8,v 1.10 2017/08/12 08:45:58 maxv Exp $
+.\" $NetBSD: compat_ibcs2.8,v 1.11 2018/12/19 13:57:45 maxv Exp $
.\"
.\" Copyright (c) 1998 Scott Bartram
.\" Copyright (c) 1995 Frank van der Linden
@@ -32,7 +32,7 @@
.\"
.\" Based on compat_linux.8
.\"
-.Dd August 12, 2017
+.Dd December 19, 2018
.Dt COMPAT_IBCS2 8
.Os
.Sh NAME
@@ -49,9 +49,6 @@ and other systems derived from
.At V.3 .
iBCS2 support is only well tested using SCO binaries.
XENIX binaries are also supported although not as well tested.
-SVR4 binaries are supported by the
-.Dv COMPAT_SVR4
-option.
.Pp
iBCS2 supports COFF, ELF, and x.out (XENIX) binary formats.
Binaries from SCO OpenServer (version 5.x) are the only ELF binaries
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.111 src/sys/arch/amd64/conf/ALL:1.112
--- src/sys/arch/amd64/conf/ALL:1.111 Fri Dec 14 22:00:26 2018
+++ src/sys/arch/amd64/conf/ALL Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.111 2018/12/14 22:00:26 jakllsch Exp $
+# $NetBSD: ALL,v 1.112 2018/12/19 13:57:45 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.111 $"
+#ident "ALL-$Revision: 1.112 $"
maxusers 64 # estimated number of users
@@ -1879,7 +1879,6 @@ options DEBUG_PTM
options DEBUG_RAWFS
options DEBUG_RPC
options DEBUG_SNAPPER
-options DEBUG_SVR4
options DEBUG_SYNC
options DEBUG_TERM
options DEBUG_UL
Index: src/sys/arch/amd64/conf/majors.amd64
diff -u src/sys/arch/amd64/conf/majors.amd64:1.28 src/sys/arch/amd64/conf/majors.amd64:1.29
--- src/sys/arch/amd64/conf/majors.amd64:1.28 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/amd64/conf/majors.amd64 Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amd64,v 1.28 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.amd64,v 1.29 2018/12/19 13:57:45 maxv Exp $
#
# Device majors for amd64
#
@@ -34,7 +34,6 @@ device-major mcd char 39 block 7 mcd
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/amiga/amiga/genassym.cf
diff -u src/sys/arch/amiga/amiga/genassym.cf:1.30 src/sys/arch/amiga/amiga/genassym.cf:1.31
--- src/sys/arch/amiga/amiga/genassym.cf:1.30 Fri Jan 14 02:06:23 2011
+++ src/sys/arch/amiga/amiga/genassym.cf Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.30 2011/01/14 02:06:23 rmind Exp $
+# $NetBSD: genassym.cf,v 1.31 2018/12/19 13:57:45 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/cpu.h>
@@ -45,11 +41,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/psl.h>
include <machine/pcb.h>
include <machine/pte.h>
@@ -193,12 +184,3 @@ define SYS_compat_13_sigreturn13 SYS_com
# miscellaneous custom chip register offsets
define CIAICR offsetof(struct CIA, icr)
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.155 src/sys/arch/amiga/amiga/locore.s:1.156
--- src/sys/arch/amiga/amiga/locore.s:1.155 Thu Dec 22 15:33:28 2011
+++ src/sys/arch/amiga/amiga/locore.s Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.155 2011/12/22 15:33:28 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.156 2018/12/19 13:57:45 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -46,7 +46,6 @@
#include "opt_bb060stupidrom.h"
#include "opt_p5ppc68kboard.h"
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_fpsp.h"
#include "opt_kgdb.h"
@@ -1059,9 +1058,6 @@ Lnoflush:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.187 src/sys/arch/amiga/conf/DRACO:1.188
--- src/sys/arch/amiga/conf/DRACO:1.187 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/amiga/conf/DRACO Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.187 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: DRACO,v 1.188 2018/12/19 13:57:45 maxv Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.187 $"
+#ident "GENERIC-$Revision: 1.188 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -125,7 +125,6 @@ options UFS_EXTATTR # Extended attribut
include "conf/compat_netbsd09.config"
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.321 src/sys/arch/amiga/conf/GENERIC:1.322
--- src/sys/arch/amiga/conf/GENERIC:1.321 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/amiga/conf/GENERIC Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.321 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC,v 1.322 2018/12/19 13:57:45 maxv Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.321 $"
+#ident "GENERIC-$Revision: 1.322 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -137,7 +137,6 @@ options UFS_EXTATTR # Extended attribut
include "conf/compat_netbsd09.config"
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.139 src/sys/arch/amiga/conf/GENERIC.in:1.140
--- src/sys/arch/amiga/conf/GENERIC.in:1.139 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/amiga/conf/GENERIC.in Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.139 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC.in,v 1.140 2018/12/19 13:57:45 maxv Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.139 $"
+#ident "GENERIC-$Revision: 1.140 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -179,7 +179,6 @@ m4_ifdef(`INSTALL_CONFIGURATION', `', `m
include "conf/compat_netbsd09.config"
options COMPAT_SUNOS # Support to run Sun (m68k) executables
-#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables
options COMPAT_NOMID # allow nonvalid machine id executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
')m4_dnl
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.180 src/sys/arch/amiga/conf/files.amiga:1.181
--- src/sys/arch/amiga/conf/files.amiga:1.180 Sat Sep 22 16:22:22 2018
+++ src/sys/arch/amiga/conf/files.amiga Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.180 2018/09/22 16:22:22 maxv Exp $
+# $NetBSD: files.amiga,v 1.181 2018/12/19 13:57:45 maxv Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -506,9 +506,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/amiga/conf/majors.amiga
diff -u src/sys/arch/amiga/conf/majors.amiga:1.24 src/sys/arch/amiga/conf/majors.amiga:1.25
--- src/sys/arch/amiga/conf/majors.amiga:1.24 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/amiga/conf/majors.amiga Wed Dec 19 13:57:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amiga,v 1.24 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.amiga,v 1.25 2018/12/19 13:57:45 maxv Exp $
#
# Device majors for amiga
#
@@ -42,7 +42,6 @@ device-major rnd char 42 rnd
device-major md char 43 block 15 md
device-major scsibus char 44 scsibus
device-major raid char 50 block 16 raid
-device-major svr4_net char 51 compat_svr4
device-major wd char 52 block 17 wd
device-major wsdisplay char 53 wsdisplay
device-major wskbd char 54 wskbd
Index: src/sys/arch/amigappc/conf/majors.amigappc
diff -u src/sys/arch/amigappc/conf/majors.amigappc:1.6 src/sys/arch/amigappc/conf/majors.amigappc:1.7
--- src/sys/arch/amigappc/conf/majors.amigappc:1.6 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/amigappc/conf/majors.amigappc Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amigappc,v 1.6 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.amigappc,v 1.7 2018/12/19 13:57:46 maxv Exp $
#
# Device majors for amigappc
#
@@ -42,7 +42,6 @@ device-major rnd char 42 rnd
device-major md char 43 block 15 md
device-major scsibus char 44 scsibus
device-major raid char 50 block 16 raid
-device-major svr4_net char 51 compat_svr4
device-major wd char 52 block 17 wd
device-major wsdisplay char 53 wsdisplay
device-major wskbd char 54 wskbd
Index: src/sys/arch/atari/atari/genassym.cf
diff -u src/sys/arch/atari/atari/genassym.cf:1.32 src/sys/arch/atari/atari/genassym.cf:1.33
--- src/sys/arch/atari/atari/genassym.cf:1.32 Fri Jan 14 02:06:24 2011
+++ src/sys/arch/atari/atari/genassym.cf Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.32 2011/01/14 02:06:24 rmind Exp $
+# $NetBSD: genassym.cf,v 1.33 2018/12/19 13:57:46 maxv Exp $
#-
# Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,6 @@
#
ifdef _KERNEL_OPT
-include "opt_compat_svr4.h"
include "opt_mbtype.h"
endif
@@ -43,11 +42,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/trap.h>
include <machine/psl.h>
@@ -221,12 +215,3 @@ quote #define stio_addr 0
define SCU_SOFTINT AD_SCU + offsetof(struct scu, sys_int)
define SCU_SYSMASK AD_SCU + offsetof(struct scu, sys_mask)
endif
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.111 src/sys/arch/atari/atari/locore.s:1.112
--- src/sys/arch/atari/atari/locore.s:1.111 Sat Jan 20 18:04:28 2018
+++ src/sys/arch/atari/atari/locore.s Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.111 2018/01/20 18:04:28 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.112 2018/12/19 13:57:46 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -46,7 +46,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpsp.h"
@@ -1049,9 +1048,6 @@ Lnoflush:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.116 src/sys/arch/atari/conf/GENERIC.in:1.117
--- src/sys/arch/atari/conf/GENERIC.in:1.116 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/atari/conf/GENERIC.in Wed Dec 19 13:57:46 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.116 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: GENERIC.in,v 1.117 2018/12/19 13:57:46 maxv Exp $
#
# Generic atari
#
@@ -161,7 +161,6 @@ no options COMPAT_15 # NetBSD 1.5,
#endif /* !SMALL030_KERNEL */
#if !defined(SMALL030_KERNEL)
#options COMPAT_SUNOS # Support to run Sun-3 executables
-#options COMPAT_SVR4 # Support to run SVR4 executables
#options COMPAT_LINUX # Support to run Linux/m68k executables
options COMPAT_AOUT_M68K # Compatibility to a.out executables
options EXEC_AOUT # a.out format executables
Index: src/sys/arch/atari/conf/files.atari
diff -u src/sys/arch/atari/conf/files.atari:1.121 src/sys/arch/atari/conf/files.atari:1.122
--- src/sys/arch/atari/conf/files.atari:1.121 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/atari/conf/files.atari Wed Dec 19 13:57:46 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.atari,v 1.121 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: files.atari,v 1.122 2018/12/19 13:57:46 maxv Exp $
maxpartitions 16
@@ -239,9 +239,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/atari/conf/majors.atari
diff -u src/sys/arch/atari/conf/majors.atari:1.23 src/sys/arch/atari/conf/majors.atari:1.24
--- src/sys/arch/atari/conf/majors.atari:1.23 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/atari/conf/majors.atari Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.atari,v 1.23 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.atari,v 1.24 2018/12/19 13:57:46 maxv Exp $
#
# Device majors for atari
#
@@ -44,7 +44,6 @@ device-major audio char 42 audio
device-major scsibus char 49 scsibus
device-major raid char 50 block 15 raid
-device-major svr4_net char 51 compat_svr4
device-major clockctl char 52 clockctl
device-major cgd char 54 block 16 cgd
device-major wskbd char 55 wskbd
Index: src/sys/arch/bebox/conf/majors.bebox
diff -u src/sys/arch/bebox/conf/majors.bebox:1.27 src/sys/arch/bebox/conf/majors.bebox:1.28
--- src/sys/arch/bebox/conf/majors.bebox:1.27 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/bebox/conf/majors.bebox Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.bebox,v 1.27 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.bebox,v 1.28 2018/12/19 13:57:46 maxv Exp $
#
# Device majors for bebox
#
@@ -39,7 +39,6 @@ device-major mcd char 39 block 7 mcd
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.32 src/sys/arch/cesfic/cesfic/locore.s:1.33
--- src/sys/arch/cesfic/cesfic/locore.s:1.32 Sat Mar 15 11:53:30 2014
+++ src/sys/arch/cesfic/cesfic/locore.s Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.32 2014/03/15 11:53:30 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.33 2018/12/19 13:57:46 maxv Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -79,7 +79,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpsp.h"
@@ -753,9 +752,6 @@ Ldorte:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/dreamcast/conf/majors.dreamcast
diff -u src/sys/arch/dreamcast/conf/majors.dreamcast:1.22 src/sys/arch/dreamcast/conf/majors.dreamcast:1.23
--- src/sys/arch/dreamcast/conf/majors.dreamcast:1.22 Thu Jun 30 20:09:22 2011
+++ src/sys/arch/dreamcast/conf/majors.dreamcast Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.dreamcast,v 1.22 2011/06/30 20:09:22 wiz Exp $
+# $NetBSD: majors.dreamcast,v 1.23 2018/12/19 13:57:46 maxv Exp $
#
# Device majors for dreamcast
#
@@ -44,7 +44,6 @@ device-major wdog char 51 wdog
device-major wsdisplay char 52 wsdisplay
device-major wskbd char 53 wskbd
device-major wsmouse char 54 wsmouse
-device-major svr4_net char 55 compat_svr4
device-major wsmux char 56 wsmux
device-major gdrom char 57 block 19 gdrom
device-major maple char 58 maple
Index: src/sys/arch/evbcf/conf/majors.evbcf
diff -u src/sys/arch/evbcf/conf/majors.evbcf:1.2 src/sys/arch/evbcf/conf/majors.evbcf:1.3
--- src/sys/arch/evbcf/conf/majors.evbcf:1.2 Tue Mar 18 18:20:41 2014
+++ src/sys/arch/evbcf/conf/majors.evbcf Wed Dec 19 13:57:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.evbcf,v 1.2 2014/03/18 18:20:41 riastradh Exp $
+# $NetBSD: majors.evbcf,v 1.3 2018/12/19 13:57:46 maxv Exp $
#
# Device majors for mvme68k
#
@@ -34,7 +34,6 @@ device-major uk char 34 uk
device-major rnd char 35 rnd
device-major scsibus char 36 scsibus
device-major raid char 37 block 16 raid
-device-major svr4_net char 38 compat_svr4
device-major clockctl char 39 clockctl
device-major cgd char 41 block 17 cgd
device-major ksyms char 42 ksyms
Index: src/sys/arch/evbmips/conf/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.28 src/sys/arch/evbmips/conf/CPMBR1400:1.29
--- src/sys/arch/evbmips/conf/CPMBR1400:1.28 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbmips/conf/CPMBR1400 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CPMBR1400,v 1.28 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: CPMBR1400,v 1.29 2018/12/19 13:57:47 maxv Exp $
include "arch/evbmips/conf/std.rasoc"
@@ -61,7 +61,6 @@ options DDB_ONPANIC=1 # see also sysct
include "conf/compat_netbsd50.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_LINUX # binary compatibility with Linux
# File systems
Index: src/sys/arch/evbmips/conf/LINKITSMART7688
diff -u src/sys/arch/evbmips/conf/LINKITSMART7688:1.8 src/sys/arch/evbmips/conf/LINKITSMART7688:1.9
--- src/sys/arch/evbmips/conf/LINKITSMART7688:1.8 Tue Aug 14 06:37:59 2018
+++ src/sys/arch/evbmips/conf/LINKITSMART7688 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: LINKITSMART7688,v 1.8 2018/08/14 06:37:59 maxv Exp $
+# $NetBSD: LINKITSMART7688,v 1.9 2018/12/19 13:57:47 maxv Exp $
#
# MediaTek MT7688
#
@@ -64,7 +64,6 @@ include "conf/compat_netbsd50.co
#options EXEC_ECOFF # exec ECOFF binaries
#options COMPAT_ULTRIX # binary compatibility with Ultrix
-#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_LINUX # binary compatibility with Linux
# File systems
Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.92 src/sys/arch/evbmips/conf/MALTA:1.93
--- src/sys/arch/evbmips/conf/MALTA:1.92 Wed Dec 12 06:29:37 2018
+++ src/sys/arch/evbmips/conf/MALTA Wed Dec 19 13:57:47 2018
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.92 2018/12/12 06:29:37 maxv Exp $
+# $NetBSD: MALTA,v 1.93 2018/12/19 13:57:47 maxv Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.92 $"
+#ident "MALTA-$Revision: 1.93 $"
maxusers 32
@@ -45,7 +45,6 @@ include "conf/compat_netbsd16.co
#options EXEC_ECOFF # exec ECOFF binaries
#options COMPAT_ULTRIX # binary compatibility with Ultrix
-#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_LINUX # binary compatibility with Linux
# File systems
Index: src/sys/arch/evbmips/conf/ZYXELKX
diff -u src/sys/arch/evbmips/conf/ZYXELKX:1.13 src/sys/arch/evbmips/conf/ZYXELKX:1.14
--- src/sys/arch/evbmips/conf/ZYXELKX:1.13 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbmips/conf/ZYXELKX Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ZYXELKX,v 1.13 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: ZYXELKX,v 1.14 2018/12/19 13:57:47 maxv Exp $
include "arch/evbmips/conf/std.rasoc"
@@ -61,7 +61,6 @@ include "conf/compat_netbsd50.co
#options COMPAT_ULTRIX # binary compatibility with Ultrix
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_LINUX # binary compatibility with Linux
# File systems
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.199 src/sys/arch/hp300/conf/GENERIC:1.200
--- src/sys/arch/hp300/conf/GENERIC:1.199 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/hp300/conf/GENERIC Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: GENERIC,v 1.200 2018/12/19 13:57:47 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -83,7 +83,6 @@ options COMPAT_AOUT_M68K # NetBSD/m68k
options COMPAT_M68K4K # NetBSD/m68k4k binary compatibility
options COMPAT_SUNOS # SunOS4 m68k binary compatibility
#options COMPAT_LINUX # Linux/m68k binary compatibility
-#options COMPAT_SVR4 # SVR4 binary compatibility
# Filesystems
file-system CD9660 # CD-ROM ISO-9660 filesystem
Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.90 src/sys/arch/hp300/conf/files.hp300:1.91
--- src/sys/arch/hp300/conf/files.hp300:1.90 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/hp300/conf/files.hp300 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.90 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: files.hp300,v 1.91 2018/12/19 13:57:47 maxv Exp $
#
# hp300-specific configuration info
@@ -233,9 +233,6 @@ include "arch/m68k/fpe/files.fpe"
# NetBSD m68k a.out Binary Compatibility (COMPAT_AOUT_M68K)
include "compat/aoutm68k/files.aoutm68k"
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# SunOS Binary Compatibility (COMPAT_SUNOS)
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
Index: src/sys/arch/hp300/conf/majors.hp300
diff -u src/sys/arch/hp300/conf/majors.hp300:1.26 src/sys/arch/hp300/conf/majors.hp300:1.27
--- src/sys/arch/hp300/conf/majors.hp300:1.26 Sun Aug 24 08:17:44 2014
+++ src/sys/arch/hp300/conf/majors.hp300 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.hp300,v 1.26 2014/08/24 08:17:44 tsutsui Exp $
+# $NetBSD: majors.hp300,v 1.27 2018/12/19 13:57:47 maxv Exp $
#
# Device majors for hp300
#
@@ -33,7 +33,6 @@ device-major md char 32 block 14 md
device-major rnd char 33 rnd
device-major scsibus char 34 scsibus
device-major raid char 35 block 15 raid
-device-major svr4_net char 36 compat_svr4
device-major wsdisplay char 37 wsdisplay
device-major wskbd char 38 wskbd
device-major wsmouse char 39 wsmouse
Index: src/sys/arch/hp300/hp300/genassym.cf
diff -u src/sys/arch/hp300/hp300/genassym.cf:1.44 src/sys/arch/hp300/hp300/genassym.cf:1.45
--- src/sys/arch/hp300/hp300/genassym.cf:1.44 Fri Jan 14 02:06:25 2011
+++ src/sys/arch/hp300/hp300/genassym.cf Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.44 2011/01/14 02:06:25 rmind Exp $
+# $NetBSD: genassym.cf,v 1.45 2018/12/19 13:57:47 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -44,11 +40,6 @@ include <sys/syscall.h>
include <uvm/uvm.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/hp300spu.h>
include <machine/cpu.h>
include <machine/frame.h>
@@ -264,12 +255,3 @@ define DIOII_BASE DIOII_BASE
define DIO_IDOFF DIO_IDOFF
define DIO_SECIDOFF DIO_SECIDOFF
define DIO_DEVICE_ID_FRAMEBUFFER DIO_DEVICE_ID_FRAMEBUFFER
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.171 src/sys/arch/hp300/hp300/locore.s:1.172
--- src/sys/arch/hp300/hp300/locore.s:1.171 Sun Aug 24 08:17:44 2014
+++ src/sys/arch/hp300/hp300/locore.s Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.171 2014/08/24 08:17:44 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.172 2018/12/19 13:57:47 maxv Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -79,7 +79,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpsp.h"
@@ -1034,9 +1033,6 @@ Laststkadj:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/i386/conf/majors.i386
diff -u src/sys/arch/i386/conf/majors.i386:1.47 src/sys/arch/i386/conf/majors.i386:1.48
--- src/sys/arch/i386/conf/majors.i386:1.47 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/i386/conf/majors.i386 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.i386,v 1.47 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.i386,v 1.48 2018/12/19 13:57:47 maxv Exp $
#
# Device majors for i386
#
@@ -40,7 +40,6 @@ device-major mcd char 39 block 7 mcd
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd vector=8:8
device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/ia64/conf/majors.ia64
diff -u src/sys/arch/ia64/conf/majors.ia64:1.13 src/sys/arch/ia64/conf/majors.ia64:1.14
--- src/sys/arch/ia64/conf/majors.ia64:1.13 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/ia64/conf/majors.ia64 Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ia64,v 1.13 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.ia64,v 1.14 2018/12/19 13:57:47 maxv Exp $
#
# Device majors for ia64
#
@@ -40,7 +40,6 @@ device-major mcd char 39 block 7 mcd
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/ibmnws/conf/majors.ibmnws
diff -u src/sys/arch/ibmnws/conf/majors.ibmnws:1.15 src/sys/arch/ibmnws/conf/majors.ibmnws:1.16
--- src/sys/arch/ibmnws/conf/majors.ibmnws:1.15 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/ibmnws/conf/majors.ibmnws Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ibmnws,v 1.15 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.ibmnws,v 1.16 2018/12/19 13:57:47 maxv Exp $
#
# Device majors for ibmnws
#
@@ -30,7 +30,6 @@ device-major md char 24 block 17 md
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/luna68k/luna68k/genassym.cf
diff -u src/sys/arch/luna68k/luna68k/genassym.cf:1.20 src/sys/arch/luna68k/luna68k/genassym.cf:1.21
--- src/sys/arch/luna68k/luna68k/genassym.cf:1.20 Sat Nov 5 15:37:17 2011
+++ src/sys/arch/luna68k/luna68k/genassym.cf Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.20 2011/11/05 15:37:17 tsutsui Exp $
+# $NetBSD: genassym.cf,v 1.21 2018/12/19 13:57:47 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-ifdef _KERNEL_OPT
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -44,11 +40,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -201,12 +192,3 @@ define SYS_compat_13_sigreturn13 SYS_com
# errno
define EFAULT EFAULT
define ENAMETOOLONG ENAMETOOLONG
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.62 src/sys/arch/luna68k/luna68k/locore.s:1.63
--- src/sys/arch/luna68k/luna68k/locore.s:1.62 Thu Sep 3 13:07:46 2015
+++ src/sys/arch/luna68k/luna68k/locore.s Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.62 2015/09/03 13:07:46 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.63 2018/12/19 13:57:47 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -725,9 +725,6 @@ Laststkadj:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.47 src/sys/arch/m68k/conf/files.m68k:1.48
--- src/sys/arch/m68k/conf/files.m68k:1.47 Sun Sep 19 01:35:43 2010
+++ src/sys/arch/m68k/conf/files.m68k Wed Dec 19 13:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.47 2010/09/19 01:35:43 tsutsui Exp $
+# $NetBSD: files.m68k,v 1.48 2018/12/19 13:57:47 maxv Exp $
#
defflag opt_fpsp.h FPSP
@@ -29,13 +29,9 @@ file arch/m68k/m68k/regdump.c
file arch/m68k/m68k/sig_machdep.c
file arch/m68k/m68k/m68k_syscall.c
file arch/m68k/m68k/sunos_syscall.c compat_sunos
-file arch/m68k/m68k/svr4_syscall.c compat_svr4
file arch/m68k/m68k/linux_syscall.c compat_linux
file arch/m68k/m68k/compat_13_machdep.c compat_13
file arch/m68k/m68k/compat_16_machdep.c compat_16
-
-file arch/m68k/m68k/svr4_machdep.c compat_svr4
-
include "compat/m68k4k/files.m68k4k"
Index: src/sys/arch/m68k/m68k/m68k_syscall.c
diff -u src/sys/arch/m68k/m68k/m68k_syscall.c:1.50 src/sys/arch/m68k/m68k/m68k_syscall.c:1.51
--- src/sys/arch/m68k/m68k/m68k_syscall.c:1.50 Sat Mar 7 18:54:57 2015
+++ src/sys/arch/m68k/m68k/m68k_syscall.c Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k_syscall.c,v 1.50 2015/03/07 18:54:57 christos Exp $ */
+/* $NetBSD: m68k_syscall.c,v 1.51 2018/12/19 13:57:48 maxv Exp $ */
/*-
* Portions Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.50 2015/03/07 18:54:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.51 2018/12/19 13:57:48 maxv Exp $");
#include "opt_execfmt.h"
#include "opt_compat_netbsd.h"
@@ -261,7 +261,7 @@ syscall_plain(register_t code, struct lw
bad:
/*
* XXX: SVR4 uses this code-path, so we may have
- * to translate errno.
+ * to translate errno. XXX OBSOLETE
*/
if (p->p_emul->e_errno)
error = p->p_emul->e_errno[error];
Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.226 src/sys/arch/mac68k/conf/GENERIC:1.227
--- src/sys/arch/mac68k/conf/GENERIC:1.226 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/mac68k/conf/GENERIC Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.226 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.227 2018/12/19 13:57:48 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.226 $"
+#ident "GENERIC-$Revision: 1.227 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -85,7 +85,6 @@ options EXEC_AOUT # support for exec'in
#options COMPAT_LINUX # compatibility with Linux/m68k binaries
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
#options COMPAT_SUNOS # compatibility with SunOS 4.x binaries
-#options COMPAT_SVR4 # compatibility with SVR4 binaries
# File systems
file-system FFS # UFS
Index: src/sys/arch/mac68k/conf/files.mac68k
diff -u src/sys/arch/mac68k/conf/files.mac68k:1.126 src/sys/arch/mac68k/conf/files.mac68k:1.127
--- src/sys/arch/mac68k/conf/files.mac68k:1.126 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/mac68k/conf/files.mac68k Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.mac68k,v 1.126 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: files.mac68k,v 1.127 2018/12/19 13:57:48 maxv Exp $
# mac68k-specific configuration info
@@ -200,9 +200,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/mac68k/conf/majors.mac68k
diff -u src/sys/arch/mac68k/conf/majors.mac68k:1.24 src/sys/arch/mac68k/conf/majors.mac68k:1.25
--- src/sys/arch/mac68k/conf/majors.mac68k:1.24 Thu Apr 23 23:22:52 2015
+++ src/sys/arch/mac68k/conf/majors.mac68k Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.mac68k,v 1.24 2015/04/23 23:22:52 pgoyette Exp $
+# $NetBSD: majors.mac68k,v 1.25 2018/12/19 13:57:48 maxv Exp $
#
# Device majors for mac68k
#
@@ -39,7 +39,6 @@ device-major wskbd char 40 wskbd
device-major wsmouse char 41 wsmouse
device-major raid char 42 block 20 raid
device-major fd char 43 block 21 fd
-device-major svr4_net char 44 compat_svr4
device-major wsmux char 45 wsmux
device-major wsdisplay char 46 wsdisplay
device-major vcoda char 47 vcoda
Index: src/sys/arch/mac68k/mac68k/genassym.cf
diff -u src/sys/arch/mac68k/mac68k/genassym.cf:1.38 src/sys/arch/mac68k/mac68k/genassym.cf:1.39
--- src/sys/arch/mac68k/mac68k/genassym.cf:1.38 Thu Feb 2 21:50:23 2017
+++ src/sys/arch/mac68k/mac68k/genassym.cf Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.38 2017/02/02 21:50:23 rin Exp $
+# $NetBSD: genassym.cf,v 1.39 2018/12/19 13:57:48 maxv Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@@ -31,10 +31,6 @@
# @(#)genassym.c 7.8 (Berkeley) 5/7/91
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/mbuf.h>
@@ -44,11 +40,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -173,12 +164,3 @@ define MACH_MACQ610 MACH_MACQ610
define MACH_MACC650 MACH_MACC650
define MACH_MACQ650 MACH_MACQ650
define MACH_MACQ800 MACH_MACQ800
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.170 src/sys/arch/mac68k/mac68k/locore.s:1.171
--- src/sys/arch/mac68k/mac68k/locore.s:1.170 Sat Mar 15 12:11:23 2014
+++ src/sys/arch/mac68k/mac68k/locore.s Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.170 2014/03/15 12:11:23 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.171 2018/12/19 13:57:48 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -75,7 +75,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpu_emulate.h"
@@ -901,9 +900,6 @@ ASENTRY_NOPROFILE(rei)
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/mvme68k/conf/files.mvme68k
diff -u src/sys/arch/mvme68k/conf/files.mvme68k:1.62 src/sys/arch/mvme68k/conf/files.mvme68k:1.63
--- src/sys/arch/mvme68k/conf/files.mvme68k:1.62 Sun Jun 12 03:35:44 2011
+++ src/sys/arch/mvme68k/conf/files.mvme68k Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvme68k,v 1.62 2011/06/12 03:35:44 rmind Exp $
+# $NetBSD: files.mvme68k,v 1.63 2018/12/19 13:57:48 maxv Exp $
# config file for mvme68k
@@ -114,9 +114,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/mvme68k/conf/majors.mvme68k
diff -u src/sys/arch/mvme68k/conf/majors.mvme68k:1.20 src/sys/arch/mvme68k/conf/majors.mvme68k:1.21
--- src/sys/arch/mvme68k/conf/majors.mvme68k:1.20 Thu Jun 30 20:09:33 2011
+++ src/sys/arch/mvme68k/conf/majors.mvme68k Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.mvme68k,v 1.20 2011/06/30 20:09:33 wiz Exp $
+# $NetBSD: majors.mvme68k,v 1.21 2018/12/19 13:57:48 maxv Exp $
#
# Device majors for mvme68k
#
@@ -33,7 +33,6 @@ device-major uk char 34 uk
device-major rnd char 35 rnd
device-major scsibus char 36 scsibus
device-major raid char 37 block 16 raid
-device-major svr4_net char 38 compat_svr4
device-major clockctl char 39 clockctl
device-major cgd char 41 block 17 cgd
device-major ksyms char 42 ksyms
Index: src/sys/arch/mvme68k/mvme68k/genassym.cf
diff -u src/sys/arch/mvme68k/mvme68k/genassym.cf:1.35 src/sys/arch/mvme68k/mvme68k/genassym.cf:1.36
--- src/sys/arch/mvme68k/mvme68k/genassym.cf:1.35 Fri Jan 14 02:06:29 2011
+++ src/sys/arch/mvme68k/mvme68k/genassym.cf Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.35 2011/01/14 02:06:29 rmind Exp $
+# $NetBSD: genassym.cf,v 1.36 2018/12/19 13:57:48 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -45,11 +41,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -218,12 +209,3 @@ define SYS_compat_13_sigreturn13 SYS_com
# errno
define EFAULT EFAULT
define ENAMETOOLONG ENAMETOOLONG
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.114 src/sys/arch/mvme68k/mvme68k/locore.s:1.115
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.114 Sat Mar 15 12:04:22 2014
+++ src/sys/arch/mvme68k/mvme68k/locore.s Wed Dec 19 13:57:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.114 2014/03/15 12:04:22 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.115 2018/12/19 13:57:48 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_fpsp.h"
#include "opt_ddb.h"
@@ -1032,9 +1031,6 @@ Laststkadj:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/mvmeppc/conf/majors.mvmeppc
diff -u src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.21 src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.22
--- src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.21 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/mvmeppc/conf/majors.mvmeppc Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.mvmeppc,v 1.21 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.mvmeppc,v 1.22 2018/12/19 13:57:49 maxv Exp $
#
# Device majors for mvmeppc
#
@@ -30,7 +30,6 @@ device-major md char 24 block 17 md
device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
-device-major svr4_net char 43 compat_svr4
device-major ipl char 44 ipfilter
device-major satlink char 45 satlink
device-major rnd char 46 rnd
Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.131 src/sys/arch/news68k/conf/GENERIC:1.132
--- src/sys/arch/news68k/conf/GENERIC:1.131 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/news68k/conf/GENERIC Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.132 2018/12/19 13:57:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.131 $"
+#ident "GENERIC-$Revision: 1.132 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -66,7 +66,6 @@ options SCSIVERBOSE # Verbose SCSI err
include "conf/compat_netbsd12.config"
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
-#options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_SUNOS # binary compatibility with SunOS
#options COMPAT_LINUX # binary compatibllity with Linux/m68k
Index: src/sys/arch/news68k/conf/GENERIC_TINY
diff -u src/sys/arch/news68k/conf/GENERIC_TINY:1.87 src/sys/arch/news68k/conf/GENERIC_TINY:1.88
--- src/sys/arch/news68k/conf/GENERIC_TINY:1.87 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/news68k/conf/GENERIC_TINY Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.87 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: GENERIC_TINY,v 1.88 2018/12/19 13:57:49 maxv Exp $
# news68k GENERIC config file for low memory machines;
#
@@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC_TINY-$Revision: 1.87 $"
+#ident "GENERIC_TINY-$Revision: 1.88 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -46,7 +46,6 @@ options PIPE_SOCKETPAIR # smaller, but
include "conf/compat_netbsd12.config"
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
-#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_SUNOS # binary compatibility with SunOS
#options COMPAT_LINUX # binary compatibllity with Linux/m68k
Index: src/sys/arch/news68k/conf/LIBERO
diff -u src/sys/arch/news68k/conf/LIBERO:1.67 src/sys/arch/news68k/conf/LIBERO:1.68
--- src/sys/arch/news68k/conf/LIBERO:1.67 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/news68k/conf/LIBERO Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: LIBERO,v 1.67 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: LIBERO,v 1.68 2018/12/19 13:57:49 maxv Exp $
# NEWS1750 config file;
#
@@ -41,7 +41,6 @@ options SCSIVERBOSE # Verbose SCSI err
include "conf/compat_netbsd13.config"
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
-#options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_SUNOS # binary compatibility with SunOS
#options COMPAT_LINUX # binary compatibllity with Linux/m68k
Index: src/sys/arch/news68k/conf/NEWS1200
diff -u src/sys/arch/news68k/conf/NEWS1200:1.67 src/sys/arch/news68k/conf/NEWS1200:1.68
--- src/sys/arch/news68k/conf/NEWS1200:1.67 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/news68k/conf/NEWS1200 Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NEWS1200,v 1.67 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: NEWS1200,v 1.68 2018/12/19 13:57:49 maxv Exp $
# news1200 config file
#
@@ -37,7 +37,6 @@ pseudo-device ksyms
include "conf/compat_netbsd12.config"
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
-#options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_SUNOS # binary compatibility with SunOS
#options COMPAT_LINUX # binary compatibllity with Linux/m68k
Index: src/sys/arch/news68k/conf/files.news68k
diff -u src/sys/arch/news68k/conf/files.news68k:1.33 src/sys/arch/news68k/conf/files.news68k:1.34
--- src/sys/arch/news68k/conf/files.news68k:1.33 Sun Nov 20 15:38:00 2011
+++ src/sys/arch/news68k/conf/files.news68k Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.news68k,v 1.33 2011/11/20 15:38:00 tsutsui Exp $
+# $NetBSD: files.news68k,v 1.34 2018/12/19 13:57:49 maxv Exp $
# NEWS68K-specific configuration info
@@ -119,9 +119,6 @@ file dev/md_root.c memory_disk_hooks
# NetBSD m68k a.out binary compatibility (COMPAT_AOUT_M68K)
include "compat/aoutm68k/files.aoutm68k"
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# SunOS binary compatibility (COMPAT_SUNOS)
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
Index: src/sys/arch/news68k/conf/majors.news68k
diff -u src/sys/arch/news68k/conf/majors.news68k:1.23 src/sys/arch/news68k/conf/majors.news68k:1.24
--- src/sys/arch/news68k/conf/majors.news68k:1.23 Sun Nov 20 15:38:00 2011
+++ src/sys/arch/news68k/conf/majors.news68k Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.news68k,v 1.23 2011/11/20 15:38:00 tsutsui Exp $
+# $NetBSD: majors.news68k,v 1.24 2018/12/19 13:57:49 maxv Exp $
#
# Device majors for news68k
#
@@ -39,7 +39,6 @@ device-major wsmux char 63 wsmux
device-major scsibus char 73 scsibus
device-major raid char 74 block 32 raid
-device-major svr4_net char 75 compat_svr4
device-major clockctl char 76 clockctl
device-major cgd char 78 block 33 cgd
device-major ksyms char 79 ksyms
Index: src/sys/arch/news68k/news68k/genassym.cf
diff -u src/sys/arch/news68k/news68k/genassym.cf:1.27 src/sys/arch/news68k/news68k/genassym.cf:1.28
--- src/sys/arch/news68k/news68k/genassym.cf:1.27 Fri Jan 14 02:06:29 2011
+++ src/sys/arch/news68k/news68k/genassym.cf Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.27 2011/01/14 02:06:29 rmind Exp $
+# $NetBSD: genassym.cf,v 1.28 2018/12/19 13:57:49 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -45,11 +41,6 @@ include <sys/syscall.h>
include <uvm/uvm.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -203,12 +194,3 @@ define SYS_exit SYS_exit
define SYS_execve SYS_execve
define SYS_compat_16___sigreturn14 SYS_compat_16___sigreturn14
define SYS_compat_13_sigreturn13 SYS_compat_13_sigreturn13
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.65 src/sys/arch/news68k/news68k/locore.s:1.66
--- src/sys/arch/news68k/news68k/locore.s:1.65 Sat Mar 15 09:24:56 2014
+++ src/sys/arch/news68k/news68k/locore.s Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.65 2014/03/15 09:24:56 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:49 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_fpsp.h"
#include "opt_ddb.h"
@@ -876,9 +875,6 @@ Laststkadj:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.146 src/sys/arch/next68k/conf/GENERIC:1.147
--- src/sys/arch/next68k/conf/GENERIC:1.146 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/next68k/conf/GENERIC Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.146 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.147 2018/12/19 13:57:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.146 $"
+#ident "GENERIC-$Revision: 1.147 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -74,7 +74,6 @@ include "conf/compat_netbsd09.config"
options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8,
options COMPAT_SUNOS # can run SunOS 4.1.1 executables
-#options COMPAT_SVR4 # can run SVR4 executables
#options COMPAT_LINUX # can run Linux/m68k executables
options COMPAT_AOUT_M68K # support for NetBSD a.out executables
options EXEC_AOUT # support for a.out executables
Index: src/sys/arch/next68k/conf/SLAB
diff -u src/sys/arch/next68k/conf/SLAB:1.58 src/sys/arch/next68k/conf/SLAB:1.59
--- src/sys/arch/next68k/conf/SLAB:1.58 Wed Aug 1 20:04:13 2018
+++ src/sys/arch/next68k/conf/SLAB Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.58 2018/08/01 20:04:13 maxv Exp $
+# $NetBSD: SLAB,v 1.59 2018/12/19 13:57:49 maxv Exp $
#
# deberg's development machine
#
@@ -50,7 +50,6 @@ include "conf/compat_netbsd14.config"
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
#options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8,
#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
-#options COMPAT_SVR4 # can run SVR4 executables
#options COMPAT_LINUX # can run Linux/m68k executables
options COMPAT_AOUT_M68K # support for NetBSD a.out executables
options EXEC_AOUT # support for a.out executables
Index: src/sys/arch/next68k/conf/files.next68k
diff -u src/sys/arch/next68k/conf/files.next68k:1.40 src/sys/arch/next68k/conf/files.next68k:1.41
--- src/sys/arch/next68k/conf/files.next68k:1.40 Sun Jun 12 03:35:45 2011
+++ src/sys/arch/next68k/conf/files.next68k Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.next68k,v 1.40 2011/06/12 03:35:45 rmind Exp $
+# $NetBSD: files.next68k,v 1.41 2018/12/19 13:57:49 maxv Exp $
# next68k-specific configuration info
@@ -95,9 +95,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/next68k/conf/majors.next68k
diff -u src/sys/arch/next68k/conf/majors.next68k:1.22 src/sys/arch/next68k/conf/majors.next68k:1.23
--- src/sys/arch/next68k/conf/majors.next68k:1.22 Thu Jun 30 20:09:34 2011
+++ src/sys/arch/next68k/conf/majors.next68k Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.next68k,v 1.22 2011/06/30 20:09:34 wiz Exp $
+# $NetBSD: majors.next68k,v 1.23 2018/12/19 13:57:49 maxv Exp $
#
# Device majors for next68k
#
@@ -37,7 +37,6 @@ device-major raid char 40 block 20 rai
device-major wsdisplay char 41 wsdisplay
device-major wskbd char 42 wskbd
device-major wsmouse char 43 wsmouse
-device-major svr4_net char 44 compat_svr4
device-major wsmux char 45 wsmux
device-major clockctl char 46 clockctl
device-major cgd char 48 block 21 cgd
Index: src/sys/arch/next68k/next68k/genassym.cf
diff -u src/sys/arch/next68k/next68k/genassym.cf:1.26 src/sys/arch/next68k/next68k/genassym.cf:1.27
--- src/sys/arch/next68k/next68k/genassym.cf:1.26 Fri Jan 14 02:06:29 2011
+++ src/sys/arch/next68k/next68k/genassym.cf Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.26 2011/01/14 02:06:29 rmind Exp $
+# $NetBSD: genassym.cf,v 1.27 2018/12/19 13:57:49 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -44,11 +40,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -213,12 +204,3 @@ define SYS_compat_13_sigreturn13 SYS_com
# errno
define EFAULT EFAULT
define ENAMETOOLONG ENAMETOOLONG
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.65 src/sys/arch/next68k/next68k/locore.s:1.66
--- src/sys/arch/next68k/next68k/locore.s:1.65 Sat Mar 15 12:06:54 2014
+++ src/sys/arch/next68k/next68k/locore.s Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.65 2014/03/15 12:06:54 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:49 maxv Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -85,7 +85,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpsp.h"
@@ -900,9 +899,6 @@ Ldorte:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/arch/sgimips/conf/majors.sgimips
diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.29 src/sys/arch/sgimips/conf/majors.sgimips:1.30
--- src/sys/arch/sgimips/conf/majors.sgimips:1.29 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/sgimips/conf/majors.sgimips Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sgimips,v 1.29 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.sgimips,v 1.30 2018/12/19 13:57:49 maxv Exp $
#
# Device majors for sgimips
#
@@ -36,7 +36,6 @@ device-major scsibus char 34 scsibus
device-major zstty char 35 zstty
device-major com char 36 com
device-major arcbios char 37
-device-major svr4_net char 43 compat_svr4
device-major ses char 44 ses
device-major wsdisplay char 50 wsdisplay
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.261 src/sys/arch/sparc/conf/GENERIC:1.262
--- src/sys/arch/sparc/conf/GENERIC:1.261 Thu Sep 6 05:36:50 2018
+++ src/sys/arch/sparc/conf/GENERIC Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.261 2018/09/06 05:36:50 maxv Exp $
+# $NetBSD: GENERIC,v 1.262 2018/12/19 13:57:49 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.261 $"
+#ident "GENERIC-$Revision: 1.262 $"
maxusers 32
@@ -153,13 +153,11 @@ options MIIVERBOSE # verbose PHY autoco
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd10.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.101 src/sys/arch/sparc/conf/INSTALL:1.102
--- src/sys/arch/sparc/conf/INSTALL:1.101 Thu Sep 6 05:36:50 2018
+++ src/sys/arch/sparc/conf/INSTALL Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.101 2018/09/06 05:36:50 maxv Exp $
+# $NetBSD: INSTALL,v 1.102 2018/12/19 13:57:49 maxv Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -133,13 +133,11 @@ options INSECURE
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
#include "conf/compat_netbsd10.config"
#options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.77 src/sys/arch/sparc/conf/KRUPS:1.78
--- src/sys/arch/sparc/conf/KRUPS:1.77 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sparc/conf/KRUPS Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.77 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: KRUPS,v 1.78 2018/12/19 13:57:49 maxv Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.77 $"
+#ident "KRUPS-$Revision: 1.78 $"
maxusers 32
@@ -160,13 +160,11 @@ options MIIVERBOSE # verbose PHY autoco
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd10.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.56 src/sys/arch/sparc/conf/MRCOFFEE:1.57
--- src/sys/arch/sparc/conf/MRCOFFEE:1.56 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sparc/conf/MRCOFFEE Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.56 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: MRCOFFEE,v 1.57 2018/12/19 13:57:49 maxv Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.56 $"
+#ident "MRCOFFEE-$Revision: 1.57 $"
maxusers 32
@@ -141,13 +141,11 @@ options MIIVERBOSE # verbose PHY autoco
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd10.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.75 src/sys/arch/sparc/conf/TADPOLE3GX:1.76
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.75 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sparc/conf/TADPOLE3GX Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.75 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: TADPOLE3GX,v 1.76 2018/12/19 13:57:49 maxv Exp $
include "arch/sparc/conf/std.sparc"
@@ -123,13 +123,11 @@ options INSECURE
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd10.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.157 src/sys/arch/sparc/conf/files.sparc:1.158
--- src/sys/arch/sparc/conf/files.sparc:1.157 Fri Jul 21 20:56:10 2017
+++ src/sys/arch/sparc/conf/files.sparc Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.157 2017/07/21 20:56:10 nakayama Exp $
+# $NetBSD: files.sparc,v 1.158 2018/12/19 13:57:49 maxv Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -330,11 +330,6 @@ include "dev/usb/files.usb"
# Compatibility modules
#
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-file arch/sparc/sparc/svr4_sigcode.s compat_svr4
-file arch/sparc/sparc/svr4_machdep.c compat_svr4
-
# SunOS Binary Compatibility (COMPAT_SUNOS)
include "compat/sunos/files.sunos"
file arch/sparc/sparc/sunos_sigcode.s compat_sunos
Index: src/sys/arch/sparc/conf/majors.sparc
diff -u src/sys/arch/sparc/conf/majors.sparc:1.36 src/sys/arch/sparc/conf/majors.sparc:1.37
--- src/sys/arch/sparc/conf/majors.sparc:1.36 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/sparc/conf/majors.sparc Wed Dec 19 13:57:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sparc,v 1.36 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.sparc,v 1.37 2018/12/19 13:57:49 maxv Exp $
#
# Device majors for sparc
#
@@ -44,7 +44,6 @@ device-major lpt char 37 lpt
device-major cgfour char 39 cgfour
device-major xd char 42 block 10 xd
-device-major svr4_net char 43 compat_svr4
device-major vcoda char 47 vcoda
Index: src/sys/arch/sparc/include/trap.h
diff -u src/sys/arch/sparc/include/trap.h:1.18 src/sys/arch/sparc/include/trap.h:1.19
--- src/sys/arch/sparc/include/trap.h:1.18 Sun Mar 27 18:47:08 2011
+++ src/sys/arch/sparc/include/trap.h Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.18 2011/03/27 18:47:08 martin Exp $ */
+/* $NetBSD: trap.h,v 1.19 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -104,7 +104,6 @@
#define T_RANGECHECK 0x85 /* explicitly signal a range checking error */
#define T_FIXALIGN 0x86 /* fix up unaligned accesses */
#define T_INTOF 0x87 /* explicitly signal integer overflow */
-#define T_SVR4_SYSCALL 0x88 /* SVR4 system call */
/* 0x89..0x8f - reserved for the OS */
#define T_BSD_SYSCALL 0x89 /* BSD system call */
@@ -113,15 +112,7 @@
/* 0x90..0x9f - reserved, will never be specified */
-/* 0xa0..0xff are currently unallocated, except the following */
-#define T_SVR4_GETCC 0xa0
-#define T_SVR4_SETCC 0xa1
-#define T_SVR4_GETPSR 0xa2
-#define T_SVR4_SETPSR 0xa3
-#define T_SVR4_GETHRTIME 0xa4
-#define T_SVR4_GETHRVTIME 0xa5
-#define T_SVR4_GETHRESTIME 0xa7
-
+/* 0xa0..0xff are currently unallocated */
#ifdef _KERNEL /* pseudo traps for locore.s */
#define T_RWRET -1 /* need first user window for trap return */
Index: src/sys/arch/sparc/sparc/locore.s
diff -u src/sys/arch/sparc/sparc/locore.s:1.271 src/sys/arch/sparc/sparc/locore.s:1.272
--- src/sys/arch/sparc/sparc/locore.s:1.271 Thu May 31 22:44:13 2018
+++ src/sys/arch/sparc/sparc/locore.s Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.271 2018/05/31 22:44:13 mrg Exp $ */
+/* $NetBSD: locore.s,v 1.272 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -53,7 +53,6 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
Index: src/sys/arch/sparc/sparc/sigcode_state.s
diff -u src/sys/arch/sparc/sparc/sigcode_state.s:1.1 src/sys/arch/sparc/sparc/sigcode_state.s:1.2
--- src/sys/arch/sparc/sparc/sigcode_state.s:1.1 Fri Jun 8 04:49:46 2001
+++ src/sys/arch/sparc/sparc/sigcode_state.s Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcode_state.s,v 1.1 2001/06/08 04:49:46 mrg Exp $ */
+/* $NetBSD: sigcode_state.s,v 1.2 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -54,8 +54,8 @@
#include <machine/frame.h>
/*
- * These defines are here so that locore.s, sunos_sigcode.s and svr4_sigcode.s
- * can all access them.
+ * These defines are here so that locore.s and sunos_sigcode.s can all access
+ * them.
*/
/*
Index: src/sys/arch/sparc/sparc/trap.c
diff -u src/sys/arch/sparc/sparc/trap.c:1.196 src/sys/arch/sparc/sparc/trap.c:1.197
--- src/sys/arch/sparc/sparc/trap.c:1.196 Fri Dec 30 17:54:43 2016
+++ src/sys/arch/sparc/sparc/trap.c Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.196 2016/12/30 17:54:43 christos Exp $ */
+/* $NetBSD: trap.c,v 1.197 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1996
@@ -49,10 +49,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.196 2016/12/30 17:54:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.197 2018/12/19 13:57:50 maxv Exp $");
#include "opt_ddb.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_sparc_arch.h"
#include "opt_multiprocessor.h"
@@ -85,9 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#else
#include <machine/frame.h>
#endif
-#ifdef COMPAT_SVR4
-#include <machine/svr4_machdep.h>
-#endif
#ifdef COMPAT_SUNOS
extern struct emul emul_sunos;
#define SUNOS_MAXSADDR_SLOP (32 * 1024)
@@ -347,9 +343,7 @@ trap(unsigned type, int psr, int pc, str
ksi.ksi_addr = (void *)pc;
break;
}
-#if defined(COMPAT_SVR4)
-badtrap:
-#endif
+
#ifdef DIAGNOSTIC
if (type < 0x90 || type > 0x9f) {
/* the following message is gratuitous */
@@ -365,19 +359,6 @@ badtrap:
ksi.ksi_addr = (void *)pc;
break;
-#ifdef COMPAT_SVR4
- case T_SVR4_GETCC:
- case T_SVR4_SETCC:
- case T_SVR4_GETPSR:
- case T_SVR4_SETPSR:
- case T_SVR4_GETHRTIME:
- case T_SVR4_GETHRVTIME:
- case T_SVR4_GETHRESTIME:
- if (!svr4_trap(type, l))
- goto badtrap;
- break;
-#endif
-
case T_AST:
break; /* the work is all in userret() */
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.212 src/sys/arch/sparc64/conf/GENERIC:1.213
--- src/sys/arch/sparc64/conf/GENERIC:1.212 Fri Dec 14 09:21:32 2018
+++ src/sys/arch/sparc64/conf/GENERIC Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.212 2018/12/14 09:21:32 nakayama Exp $
+# $NetBSD: GENERIC,v 1.213 2018/12/19 13:57:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.212 $"
+#ident "GENERIC-$Revision: 1.213 $"
maxusers 64
@@ -129,14 +129,11 @@ options MIIVERBOSE # verbose PHY autoco
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd09.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
-#options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
options EXEC_AOUT # execve(2) support for a.out binaries
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
Index: src/sys/arch/sparc64/conf/GENERIC32
diff -u src/sys/arch/sparc64/conf/GENERIC32:1.141 src/sys/arch/sparc64/conf/GENERIC32:1.142
--- src/sys/arch/sparc64/conf/GENERIC32:1.141 Wed May 25 20:00:50 2016
+++ src/sys/arch/sparc64/conf/GENERIC32 Wed Dec 19 13:57:50 2018
@@ -1,13 +1,12 @@
-# $NetBSD: GENERIC32,v 1.141 2016/05/25 20:00:50 nakayama Exp $
+# $NetBSD: GENERIC32,v 1.142 2018/12/19 13:57:50 maxv Exp $
#
# GENERIC machine description file for 32-bit kernel
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC32-$Revision: 1.141 $"
+#ident "GENERIC32-$Revision: 1.142 $"
include "arch/sparc64/conf/std.sparc64-32"
no options COMPAT_NETBSD32
-no options COMPAT_SVR4_32
Index: src/sys/arch/sparc64/conf/NONPLUS
diff -u src/sys/arch/sparc64/conf/NONPLUS:1.59 src/sys/arch/sparc64/conf/NONPLUS:1.60
--- src/sys/arch/sparc64/conf/NONPLUS:1.59 Wed May 25 20:00:50 2016
+++ src/sys/arch/sparc64/conf/NONPLUS Wed Dec 19 13:57:50 2018
@@ -1,9 +1,8 @@
-# $NetBSD: NONPLUS,v 1.59 2016/05/25 20:00:50 nakayama Exp $
+# $NetBSD: NONPLUS,v 1.60 2018/12/19 13:57:50 maxv Exp $
include "arch/sparc64/conf/NONPLUS64"
include "arch/sparc64/conf/std.sparc64-32"
-#ident "NONPLUS-$Revision: 1.59 $"
+#ident "NONPLUS-$Revision: 1.60 $"
no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
-no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
Index: src/sys/arch/sparc64/conf/NONPLUS64
diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.55 src/sys/arch/sparc64/conf/NONPLUS64:1.56
--- src/sys/arch/sparc64/conf/NONPLUS64:1.55 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sparc64/conf/NONPLUS64 Wed Dec 19 13:57:50 2018
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.55 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: NONPLUS64,v 1.56 2018/12/19 13:57:50 maxv Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.55 $"
+#ident "NONPLUS64-$Revision: 1.56 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -98,14 +98,11 @@ options SCSIVERBOSE
#options SETUIDSCRIPTS
## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
+## In the cases of COMPAT_SUNOS, you may need to set up additional user-level
+## utilities or system configuration files. See compat_sunos(8).
include "conf/compat_netbsd09.config"
options COMPAT_SUNOS # SunOS 4.x binary compatibility
-#options COMPAT_SVR4 # SunOS 5.x binary compatibility
-#options COMPAT_SVR4_32 # 32-bit SVR4 binaries
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
options EXEC_ELF32 # Exec module for NetBSD/sparc 1.5 binaries.
#options SYSCALL_DEBUG
Index: src/sys/arch/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.156 src/sys/arch/sparc64/conf/files.sparc64:1.157
--- src/sys/arch/sparc64/conf/files.sparc64:1.156 Sat Oct 20 06:25:46 2018
+++ src/sys/arch/sparc64/conf/files.sparc64 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.156 2018/10/20 06:25:46 macallan Exp $
+# $NetBSD: files.sparc64,v 1.157 2018/12/19 13:57:50 maxv Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -297,16 +297,6 @@ include "compat/netbsd32/files.netbsd32"
file arch/sparc64/sparc64/netbsd32_machdep.c compat_netbsd32
file arch/sparc64/sparc64/netbsd32_sigcode.s compat_netbsd32
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-file arch/sparc64/sparc64/svr4_machdep.c compat_svr4
-file arch/sparc64/sparc64/svr4_sigcode64.s compat_svr4 & exec_elf64
-
-# 32-bit SVR4 Binary Compatibility (COMPAT_SVR4_32)
-include "compat/svr4_32/files.svr4_32"
-file arch/sparc64/sparc64/svr4_32_machdep.c compat_svr4_32
-file arch/sparc64/sparc64/svr4_32_sigcode.s compat_svr4_32 | (compat_svr4 & !exec_elf64)
-
# SunOS Binary Compatibility (COMPAT_SUNOS), 32-bit & 64-bit kernel
# (64-bit also depends on COMPAT_NETBSD32)
include "compat/sunos/files.sunos"
Index: src/sys/arch/sparc64/conf/majors.sparc64
diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.35 src/sys/arch/sparc64/conf/majors.sparc64:1.36
--- src/sys/arch/sparc64/conf/majors.sparc64:1.35 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/sparc64/conf/majors.sparc64 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sparc64,v 1.35 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.sparc64,v 1.36 2018/12/19 13:57:50 maxv Exp $
#
# Device majors for sparc64
#
@@ -40,7 +40,6 @@ device-major lpt char 37 lpt
# sparc: device-major cgfour char 39 cgfour
# sparc: device-major xd char 42 block 10 xd
-device-major svr4_net char 43 compat_svr4
device-major vcoda char 47 vcoda
Index: src/sys/arch/sparc64/include/Makefile
diff -u src/sys/arch/sparc64/include/Makefile:1.32 src/sys/arch/sparc64/include/Makefile:1.33
--- src/sys/arch/sparc64/include/Makefile:1.32 Thu Jul 12 10:46:47 2018
+++ src/sys/arch/sparc64/include/Makefile Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/07/12 10:46:47 maxv Exp $
+# $NetBSD: Makefile,v 1.33 2018/12/19 13:57:50 maxv Exp $
INCSDIR= /usr/include/sparc64
@@ -17,7 +17,7 @@ INCS= ansi.h aout_machdep.h asm.h autoco
oldmon.h openpromio.h \
param.h pcb.h pmap.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h remote-sl.h rwlock.h \
- setjmp.h signal.h sljit_machdep.h svr4_machdep.h \
+ setjmp.h signal.h sljit_machdep.h \
trap.h types.h \
vmparam.h vuid_event.h \
wchar_limits.h \
Index: src/sys/arch/sparc64/include/trap.h
diff -u src/sys/arch/sparc64/include/trap.h:1.11 src/sys/arch/sparc64/include/trap.h:1.12
--- src/sys/arch/sparc64/include/trap.h:1.11 Wed Apr 1 18:38:30 2015
+++ src/sys/arch/sparc64/include/trap.h Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.11 2015/04/01 18:38:30 palle Exp $ */
+/* $NetBSD: trap.h,v 1.12 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1996-1999 Eduardo Horvath
@@ -115,18 +115,10 @@
#define T_RANGECHECK 0x105 /* ? */
#define T_FIXALIGN 0x106 /* fix up unaligned accesses */
#define T_INTOF 0x107 /* integer overflow ? */
-#define T_SVR4_SYSCALL 0x108 /* SVR4 system call */
#define T_BSD_SYSCALL 0x109 /* BSD system call */
#define T_KGDB_EXEC 0x10a /* for kernel gdb */
/* 0x10c..0x1ff are currently unallocated, except the following */
-#define T_SVR4_GETCC 0x120
-#define T_SVR4_SETCC 0x121
-#define T_SVR4_GETPSR 0x122
-#define T_SVR4_SETPSR 0x123
-#define T_SVR4_GETHRTIME 0x124
-#define T_SVR4_GETHRVTIME 0x125
-#define T_SVR4_GETHRESTIME 0x127
#define T_GETCC 0x132
#define T_SETCC 0x133
#define T_SVID_SYSCALL 0x164
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.289 src/sys/arch/sparc64/sparc64/machdep.c:1.290
--- src/sys/arch/sparc64/sparc64/machdep.c:1.289 Tue Nov 27 14:09:54 2018
+++ src/sys/arch/sparc64/sparc64/machdep.c Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.289 2018/11/27 14:09:54 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.290 2018/12/19 13:57:50 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,13 +71,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.289 2018/11/27 14:09:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.290 2018/12/19 13:57:50 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include "opt_modular.h"
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include <sys/param.h>
@@ -142,7 +141,7 @@ int bus_space_debug = 0; /* This may be
#define DPRINTF(l, s)
#endif
-#if defined(COMPAT_16) || defined(COMPAT_SVR4) || defined(COMPAT_SVR4_32) || defined(COMPAT_SUNOS)
+#if defined(COMPAT_16) || defined(COMPAT_SUNOS)
#ifdef DEBUG
/* See <sparc64/sparc64/sigdebug.h> */
int sigdebug = 0x0;
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.188 src/sys/arch/sparc64/sparc64/trap.c:1.189
--- src/sys/arch/sparc64/sparc64/trap.c:1.188 Sun Feb 12 19:35:54 2017
+++ src/sys/arch/sparc64/sparc64/trap.c Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.188 2017/02/12 19:35:54 palle Exp $ */
+/* $NetBSD: trap.c,v 1.189 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,11 +50,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.188 2017/02/12 19:35:54 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.189 2018/12/19 13:57:50 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_netbsd32.h"
#include <sys/param.h>
@@ -85,12 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#else
#include <machine/frame.h>
#endif
-#ifdef COMPAT_SVR4
-#include <machine/svr4_machdep.h>
-#endif
-#ifdef COMPAT_SVR4_32
-#include <machine/svr4_32_machdep.h>
-#endif
#include <sparc64/sparc64/cache.h>
@@ -601,9 +594,7 @@ dopanic:
}
/* NOTREACHED */
}
-#if defined(COMPAT_SVR4) || defined(COMPAT_SVR4_32)
-badtrap:
-#endif
+
/* the following message is gratuitous */
/* ... but leave it in until we find anything */
printf("%s[%d]: unimplemented software trap 0x%x\n",
@@ -616,25 +607,6 @@ badtrap:
ksi.ksi_addr = (void *)pc;
break;
-#if defined(COMPAT_SVR4) || defined(COMPAT_SVR4_32)
- case T_SVR4_GETCC:
- case T_SVR4_SETCC:
- case T_SVR4_GETPSR:
- case T_SVR4_SETPSR:
- case T_SVR4_GETHRTIME:
- case T_SVR4_GETHRVTIME:
- case T_SVR4_GETHRESTIME:
-#if defined(COMPAT_SVR4_32)
- if (svr4_32_trap(type, l))
- break;
-#endif
-#if defined(COMPAT_SVR4)
- if (svr4_trap(type, l))
- break;
-#endif
- goto badtrap;
-#endif
-
case T_AST:
want_ast = 0;
if (l->l_pflag & LP_OWEUPC) {
Index: src/sys/arch/sun2/conf/files.sun2
diff -u src/sys/arch/sun2/conf/files.sun2:1.20 src/sys/arch/sun2/conf/files.sun2:1.21
--- src/sys/arch/sun2/conf/files.sun2:1.20 Sun Jun 12 03:35:47 2011
+++ src/sys/arch/sun2/conf/files.sun2 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun2,v 1.20 2011/06/12 03:35:47 rmind Exp $
+# $NetBSD: files.sun2,v 1.21 2018/12/19 13:57:50 maxv Exp $
#
# sun2-specific configuration info
@@ -166,9 +166,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/sun2/conf/majors.sun2
diff -u src/sys/arch/sun2/conf/majors.sun2:1.20 src/sys/arch/sun2/conf/majors.sun2:1.21
--- src/sys/arch/sun2/conf/majors.sun2:1.20 Thu Jun 30 20:09:37 2011
+++ src/sys/arch/sun2/conf/majors.sun2 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sun2,v 1.20 2011/06/30 20:09:37 wiz Exp $
+# $NetBSD: majors.sun2,v 1.21 2018/12/19 13:57:50 maxv Exp $
#
# Device majors for sun2
#
@@ -48,7 +48,6 @@ device-major uk char 61 uk
device-major rnd char 80 rnd
device-major scsibus char 81 scsibus
device-major raid char 82 block 25 raid
-device-major svr4_net char 83 compat_svr4
device-major pcons char 88 pcons
device-major clockctl char 89 clockctl
Index: src/sys/arch/sun2/sun2/genassym.cf
diff -u src/sys/arch/sun2/sun2/genassym.cf:1.11 src/sys/arch/sun2/sun2/genassym.cf:1.12
--- src/sys/arch/sun2/sun2/genassym.cf:1.11 Thu Dec 10 05:10:04 2009
+++ src/sys/arch/sun2/sun2/genassym.cf Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.11 2009/12/10 05:10:04 rmind Exp $
+# $NetBSD: genassym.cf,v 1.12 2018/12/19 13:57:50 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -66,10 +66,6 @@
# from: @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/cdefs.h>
include <sys/errno.h>
@@ -78,11 +74,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/dvma.h>
include <machine/mon.h>
@@ -201,12 +192,3 @@ define FR_SIZE sizeof(struct trapframe
# FP frame offsets
define FPF_REGS offsetof(struct fpframe, fpf_regs[0])
define FPF_FPCR offsetof(struct fpframe, fpf_fpcr)
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.25 src/sys/arch/sun2/sun2/locore.s:1.26
--- src/sys/arch/sun2/sun2/locore.s:1.25 Mon Mar 24 18:50:08 2014
+++ src/sys/arch/sun2/sun2/locore.s Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.25 2014/03/24 18:50:08 christos Exp $ */
+/* $NetBSD: locore.s,v 1.26 2018/12/19 13:57:50 maxv Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -79,7 +79,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
@@ -533,9 +532,6 @@ Ldorte:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
.text
Index: src/sys/arch/sun3/conf/DISKLESS
diff -u src/sys/arch/sun3/conf/DISKLESS:1.75 src/sys/arch/sun3/conf/DISKLESS:1.76
--- src/sys/arch/sun3/conf/DISKLESS:1.75 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sun3/conf/DISKLESS Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.75 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: DISKLESS,v 1.76 2018/12/19 13:57:50 maxv Exp $
# DISKLESS - Root and swap on NFS
# Desktop machines only (3/50, 3/60, 3/110)
@@ -47,7 +47,6 @@ options USERCONF # userconf(4) support
include "conf/compat_netbsd13.config"
#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
-#options COMPAT_SVR4 # can run SVR4 executables
#options COMPAT_AOUT_M68K # support for NetBSD a.out executables
#options COMPAT_LINUX # can run Linux/m68k executables
#options EXEC_AOUT # support for a.out executables
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.179 src/sys/arch/sun3/conf/GENERIC:1.180
--- src/sys/arch/sun3/conf/GENERIC:1.179 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sun3/conf/GENERIC Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: GENERIC,v 1.180 2018/12/19 13:57:50 maxv Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.179 $"
+#ident "GENERIC-$Revision: 1.180 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -76,7 +76,6 @@ options DDB_HISTORY_SIZE=512 # enable h
include "conf/compat_netbsd60.config"
#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
-#options COMPAT_SVR4 # can run SVR4 executables
#options COMPAT_AOUT_M68K # support for NetBSD a.out executables
#options COMPAT_LINUX # can run Linux/m68k executables
#options EXEC_AOUT # support for a.out executables
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.132 src/sys/arch/sun3/conf/GENERIC3X:1.133
--- src/sys/arch/sun3/conf/GENERIC3X:1.132 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sun3/conf/GENERIC3X Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.132 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: GENERIC3X,v 1.133 2018/12/19 13:57:50 maxv Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun3/conf/std.sun3x"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.132 $"
+#ident "GENERIC3X-$Revision: 1.133 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -60,7 +60,6 @@ include "conf/compat_netbsd60.config"
#options COMPAT_LINUX # can run Linux/m68k executables
#options EXEC_AOUT # support for a.out executables
#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
-#options COMPAT_SVR4 # can run SVR4 executables
# Filesystem options
file-system FFS # Berkeley Fast Filesystem
Index: src/sys/arch/sun3/conf/files.sun3
diff -u src/sys/arch/sun3/conf/files.sun3:1.82 src/sys/arch/sun3/conf/files.sun3:1.83
--- src/sys/arch/sun3/conf/files.sun3:1.82 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/sun3/conf/files.sun3 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun3,v 1.82 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: files.sun3,v 1.83 2018/12/19 13:57:50 maxv Exp $
#
# sun3-specific configuration info
@@ -256,9 +256,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/sun3/conf/majors.sun3
diff -u src/sys/arch/sun3/conf/majors.sun3:1.20 src/sys/arch/sun3/conf/majors.sun3:1.21
--- src/sys/arch/sun3/conf/majors.sun3:1.20 Thu Jun 30 20:09:37 2011
+++ src/sys/arch/sun3/conf/majors.sun3 Wed Dec 19 13:57:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sun3,v 1.20 2011/06/30 20:09:37 wiz Exp $
+# $NetBSD: majors.sun3,v 1.21 2018/12/19 13:57:50 maxv Exp $
#
# Device majors for sun3/sun3x
#
@@ -56,7 +56,6 @@ device-major uk char 61 uk
device-major rnd char 80 rnd
device-major scsibus char 81 scsibus
device-major raid char 82 block 25 raid
-device-major svr4_net char 83 compat_svr4
device-major clockctl char 84 clockctl
device-major cgd char 86 block 26 cgd
device-major ksyms char 87 ksyms
Index: src/sys/arch/sun3/sun3/genassym.cf
diff -u src/sys/arch/sun3/sun3/genassym.cf:1.15 src/sys/arch/sun3/sun3/genassym.cf:1.16
--- src/sys/arch/sun3/sun3/genassym.cf:1.15 Sat Sep 7 15:56:11 2013
+++ src/sys/arch/sun3/sun3/genassym.cf Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.15 2013/09/07 15:56:11 tsutsui Exp $
+# $NetBSD: genassym.cf,v 1.16 2018/12/19 13:57:51 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -66,10 +66,6 @@
# from: @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/cdefs.h>
include <sys/errno.h>
@@ -78,11 +74,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/dvma.h>
include <machine/mon.h>
@@ -200,12 +191,3 @@ define FR_SIZE sizeof(struct trapframe
# FP frame offsets
define FPF_REGS offsetof(struct fpframe, fpf_regs[0])
define FPF_FPCR offsetof(struct fpframe, fpf_fpcr)
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.97 src/sys/arch/sun3/sun3/locore.s:1.98
--- src/sys/arch/sun3/sun3/locore.s:1.97 Thu Nov 7 17:50:02 2013
+++ src/sys/arch/sun3/sun3/locore.s Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.97 2013/11/07 17:50:02 christos Exp $ */
+/* $NetBSD: locore.s,v 1.98 2018/12/19 13:57:51 maxv Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -78,7 +78,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
@@ -579,9 +578,6 @@ Ldorte:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
.text
Index: src/sys/arch/sun3/sun3x/genassym.cf
diff -u src/sys/arch/sun3/sun3x/genassym.cf:1.13 src/sys/arch/sun3/sun3x/genassym.cf:1.14
--- src/sys/arch/sun3/sun3x/genassym.cf:1.13 Fri Oct 15 15:55:53 2010
+++ src/sys/arch/sun3/sun3x/genassym.cf Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.13 2010/10/15 15:55:53 tsutsui Exp $
+# $NetBSD: genassym.cf,v 1.14 2018/12/19 13:57:51 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -66,10 +66,6 @@
# from: @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/cdefs.h>
include <sys/errno.h>
@@ -78,11 +74,6 @@ include <sys/syscall.h>
include <uvm/uvm_extern.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/dvma.h>
include <machine/mon.h>
@@ -190,12 +181,3 @@ define FR_SIZE sizeof(struct trapframe
# FP frame offsets
define FPF_REGS offsetof(struct fpframe, fpf_regs[0])
define FPF_FPCR offsetof(struct fpframe, fpf_fpcr)
-
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.65 src/sys/arch/sun3/sun3x/locore.s:1.66
--- src/sys/arch/sun3/sun3x/locore.s:1.65 Mon Mar 24 18:42:56 2014
+++ src/sys/arch/sun3/sun3x/locore.s Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.65 2014/03/24 18:42:56 christos Exp $ */
+/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:51 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,7 +38,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
@@ -567,9 +566,6 @@ Ldorte:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
.text
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.191 src/sys/arch/x68k/conf/GENERIC:1.192
--- src/sys/arch/x68k/conf/GENERIC:1.191 Tue Oct 23 19:58:53 2018
+++ src/sys/arch/x68k/conf/GENERIC Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.191 2018/10/23 19:58:53 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.192 2018/12/19 13:57:51 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.191 $"
+#ident "GENERIC-$Revision: 1.192 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -150,7 +150,6 @@ include "conf/compat_netbsd09.config"
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
#options COMPAT_M68K4K # NetBSD/m68k4k binaries
#options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken
-#options COMPAT_SVR4 # SVR4 binary compatibility; broken
#options COMPAT_LINUX # Linux/m68k binary compatibility
## File systems.
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.116 src/sys/arch/x68k/conf/INSTALL:1.117
--- src/sys/arch/x68k/conf/INSTALL:1.116 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/x68k/conf/INSTALL Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.116 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: INSTALL,v 1.117 2018/12/19 13:57:51 maxv Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.116 $"
+#ident "INSTALL-$Revision: 1.117 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -134,7 +134,6 @@ include "conf/compat_netbsd30.config"
#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
#options COMPAT_M68K4K # NetBSD/m68k4k binaries
#options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken
-#options COMPAT_SVR4 # SVR4 binary compatibility; broken
#options COMPAT_LINUX # Linux/m68k binary compatibility
## File systems.
Index: src/sys/arch/x68k/conf/files.x68k
diff -u src/sys/arch/x68k/conf/files.x68k:1.80 src/sys/arch/x68k/conf/files.x68k:1.81
--- src/sys/arch/x68k/conf/files.x68k:1.80 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/x68k/conf/files.x68k Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.x68k,v 1.80 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: files.x68k,v 1.81 2018/12/19 13:57:51 maxv Exp $
#
# new style config file for x68k architecture
#
@@ -194,9 +194,6 @@ include "compat/aoutm68k/files.aoutm68k"
include "compat/sunos/files.sunos"
file arch/m68k/m68k/sunos_machdep.c compat_sunos
-# SVR4 Binary Compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
-
# Linux binary compatibility (COMPAT_LINUX)
include "compat/linux/files.linux"
include "compat/linux/arch/m68k/files.linux_m68k"
Index: src/sys/arch/x68k/conf/majors.x68k
diff -u src/sys/arch/x68k/conf/majors.x68k:1.28 src/sys/arch/x68k/conf/majors.x68k:1.29
--- src/sys/arch/x68k/conf/majors.x68k:1.28 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/x68k/conf/majors.x68k Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: majors.x68k,v 1.28 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.x68k,v 1.29 2018/12/19 13:57:51 maxv Exp $
#
# Device majors for x68k
#
@@ -39,7 +39,6 @@ device-major ipl char 38 ipfilter
device-major rnd char 39 rnd
device-major scsibus char 40 scsibus
device-major raid char 41 block 16 raid
-device-major svr4_net char 42 compat_svr4
device-major clockctl char 48 clockctl
device-major usb char 50 usb
device-major ugen char 51 ugen
Index: src/sys/arch/x68k/x68k/genassym.cf
diff -u src/sys/arch/x68k/x68k/genassym.cf:1.34 src/sys/arch/x68k/x68k/genassym.cf:1.35
--- src/sys/arch/x68k/x68k/genassym.cf:1.34 Sat Mar 8 17:44:37 2014
+++ src/sys/arch/x68k/x68k/genassym.cf Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.34 2014/03/08 17:44:37 tsutsui Exp $
+# $NetBSD: genassym.cf,v 1.35 2018/12/19 13:57:51 maxv Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -31,10 +31,6 @@
# @(#)genassym.c 8.3 (Berkeley) 1/4/94
#
-if defined(_KERNEL_OPT)
-include "opt_compat_svr4.h"
-endif
-
include <sys/param.h>
include <sys/buf.h>
include <sys/proc.h>
@@ -44,11 +40,6 @@ include <sys/syscall.h>
include <uvm/uvm.h>
-ifdef COMPAT_SVR4
-include <compat/svr4/svr4_syscall.h>
-include <compat/svr4/svr4_ucontext.h>
-endif
-
include <machine/cpu.h>
include <machine/psl.h>
include <machine/pcb.h>
@@ -217,14 +208,5 @@ define SYS_compat_13_sigreturn13 SYS_com
define EFAULT EFAULT
define ENAMETOOLONG ENAMETOOLONG
-# SVR4 binary compatibility
-ifdef COMPAT_SVR4
-define SVR4_SIGF_HANDLER offsetof(struct svr4_sigframe, sf_handler)
-define SVR4_SIGF_UC offsetof(struct svr4_sigframe, sf_uc)
-define SVR4_SYS_context SVR4_SYS_context
-define SVR4_SYS_exit SVR4_SYS_exit
-define SVR4_SETCONTEXT SVR4_SETCONTEXT
-endif
-
# Bootloader / kernel interface
define X68K_BOOTIF_VERS X68K_BOOTIF_VERS
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.119 src/sys/arch/x68k/x68k/locore.s:1.120
--- src/sys/arch/x68k/x68k/locore.s:1.119 Sat Jul 25 06:24:53 2015
+++ src/sys/arch/x68k/x68k/locore.s Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.119 2015/07/25 06:24:53 isaki Exp $ */
+/* $NetBSD: locore.s,v 1.120 2018/12/19 13:57:51 maxv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,6 @@
*/
#include "opt_compat_netbsd.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_sunos.h"
#include "opt_ddb.h"
#include "opt_fpsp.h"
@@ -776,9 +775,6 @@ Laststkadj:
#ifdef COMPAT_SUNOS
#include <m68k/m68k/sunos_sigcode.s>
#endif
-#ifdef COMPAT_SVR4
-#include <m68k/m68k/svr4_sigcode.s>
-#endif
/*
* Primitives
Index: src/sys/compat/Makefile.syscall
diff -u src/sys/compat/Makefile.syscall:1.1 src/sys/compat/Makefile.syscall:1.2
--- src/sys/compat/Makefile.syscall:1.1 Mon Jan 16 17:42:52 2017
+++ src/sys/compat/Makefile.syscall Wed Dec 19 13:57:51 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.syscall,v 1.1 2017/01/16 17:42:52 christos Exp $
+# $NetBSD: Makefile.syscall,v 1.2 2018/12/19 13:57:51 maxv Exp $
SUBDIR = aoutm68k freebsd ibcs2 linux linux32 netbsd32
-SUBDIR += osf1 sunos sunos32 svr4 svr4_32 ultrix
+SUBDIR += osf1 sunos sunos32 ultrix
.include <bsd.subdir.mk>
Index: src/sys/compat/sunos/sunos_dirent.h
diff -u src/sys/compat/sunos/sunos_dirent.h:1.3 src/sys/compat/sunos/sunos_dirent.h:1.4
--- src/sys/compat/sunos/sunos_dirent.h:1.3 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/sunos/sunos_dirent.h Wed Dec 19 13:57:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_dirent.h,v 1.3 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: sunos_dirent.h,v 1.4 2018/12/19 13:57:51 maxv Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -45,4 +45,4 @@ struct sunos_dirent {
#define SUNOS_NAMEOFF(dp) ((char *)&(dp)->d_name - (char *)dp)
#define SUNOS_RECLEN(de,namlen) ALIGN((SUNOS_NAMEOFF(de) + (namlen) + 1))
-#endif /* !_SVR4_DIRENT_H_ */
+#endif /* !_SUNOS_DIRENT_H_ */
Index: src/sys/compat/sys/socket.h
diff -u src/sys/compat/sys/socket.h:1.15 src/sys/compat/sys/socket.h:1.16
--- src/sys/compat/sys/socket.h:1.15 Sat Jul 29 06:12:50 2017
+++ src/sys/compat/sys/socket.h Wed Dec 19 13:57:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.15 2017/07/29 06:12:50 maxv Exp $ */
+/* $NetBSD: socket.h,v 1.16 2018/12/19 13:57:52 maxv Exp $ */
/*
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -38,7 +38,6 @@
#include "opt_compat_netbsd.h"
#include "opt_compat_linux.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_ultrix.h"
#include "opt_compat_43.h"
#include "opt_modular.h"
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1218 src/sys/conf/files:1.1219
--- src/sys/conf/files:1.1218 Sat Dec 8 21:14:37 2018
+++ src/sys/conf/files Wed Dec 19 13:57:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1218 2018/12/08 21:14:37 thorpej Exp $
+# $NetBSD: files,v 1.1219 2018/12/19 13:57:52 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -156,7 +156,6 @@ defflag COMPAT_IBCS2
defflag COMPAT_LINUX: COMPAT_NETBSD
defflag COMPAT_OSF1
defflag COMPAT_SUNOS: COMPAT_30
-defflag opt_compat_svr4.h COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2
defflag COMPAT_ULTRIX: COMPAT_50
defflag COMPAT_NETBSD32
defflag COMPAT_LINUX32 : COMPAT_LINUX, COMPAT_NETBSD32
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.213 src/sys/modules/Makefile:1.214
--- src/sys/modules/Makefile:1.213 Tue Nov 27 06:31:15 2018
+++ src/sys/modules/Makefile Wed Dec 19 13:57:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2018/11/27 06:31:15 pgoyette Exp $
+# $NetBSD: Makefile,v 1.214 2018/12/19 13:57:52 maxv Exp $
.include <bsd.own.mk>
@@ -321,7 +321,6 @@ SUBDIR+= wbsio
SUBDIR+= compat_aoutm68k
#SUBDIR+= compat_linux
#SUBDIR+= compat_sunos
-#SUBDIR+= compat_svr4
.endif
.if ${MACHINE_ARCH} == "i386" || \
Index: src/sys/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.8 src/sys/rump/librump/rumpkern/devsw.c:1.9
--- src/sys/rump/librump/rumpkern/devsw.c:1.8 Sat Jan 14 21:36:58 2017
+++ src/sys/rump/librump/rumpkern/devsw.c Wed Dec 19 13:57:52 2018
@@ -73,7 +73,6 @@ struct devsw_conv devsw_conv0[] = {
{ "tun", -1, 40, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "vnd", 14, 41, DEVNODE_VECTOR, 0, { 2, 8 }},
{ "audio", -1, 42, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { "svr4_net", -1, 43, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "ipl", -1, 44, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "satlink", -1, 45, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "rnd", -1, 46, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
Index: src/sys/sys/ioctl.h
diff -u src/sys/sys/ioctl.h:1.36 src/sys/sys/ioctl.h:1.37
--- src/sys/sys/ioctl.h:1.36 Fri Feb 13 22:41:04 2009
+++ src/sys/sys/ioctl.h Wed Dec 19 13:57:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ioctl.h,v 1.36 2009/02/13 22:41:04 apb Exp $ */
+/* $NetBSD: ioctl.h,v 1.37 2018/12/19 13:57:52 maxv Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -104,7 +104,6 @@ __END_DECLS
#if defined(_KERNEL_OPT)
#include "opt_compat_freebsd.h"
#include "opt_compat_sunos.h"
-#include "opt_compat_svr4.h"
#include "opt_compat_43.h"
#include "opt_compat_osf1.h"
#include "opt_compat_ibcs2.h"
@@ -112,7 +111,7 @@ __END_DECLS
#endif
#if defined(USE_OLD_TTY) || defined(COMPAT_43) || defined(COMPAT_SUNOS) || \
- defined(COMPAT_SVR4) || defined(COMPAT_FREEBSD) || defined(COMPAT_OSF1) || \
+ defined(COMPAT_FREEBSD) || defined(COMPAT_OSF1) || \
defined(COMPAT_IBCS2) || defined(MODULAR)
#include <sys/ioctl_compat.h>
#endif
