Module Name: src
Committed By: martin
Date: Thu Apr 12 14:06:14 UTC 2018
Modified Files:
src/sys/arch/sun3/conf [netbsd-8]: GENERIC GENERIC3X Makefile.sun3
src/sys/arch/sun3/include [netbsd-8]: param3.h vmparam3.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #745):
sys/arch/sun3/conf/Makefile.sun3: revision 1.106
sys/arch/sun3/conf/Makefile.sun3: revision 1.107
sys/arch/sun3/conf/GENERIC3X: revision 1.131
sys/arch/sun3/include/param3.h: revision 1.57
sys/arch/sun3/conf/GENERIC: revision 1.177
sys/arch/sun3/conf/GENERIC: revision 1.178
sys/arch/sun3/include/vmparam3.h: revision 1.39
sun3:
- build libkern as an archive for non modular builds. from maya@
- cut down GENERIC a bunch to bring below 2MB.
- reduce UBC_NWINS, MAXEXEC, and PAGER_MAP_DEFAULT_SIZE to recover
enough lost VA to actually run basic tests.
also disable SYSCTL_INCLUDE_DESCR.
copy sun3 disables to sun3x mostly. it has the same ufsboot 2MB limit.
Build compat code as .a if not MODULAR.
Removes some more unused functions.
To generate a diff of this commit:
cvs rdiff -u -r1.172.10.1 -r1.172.10.2 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.126.10.1 -r1.126.10.2 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.104 -r1.104.10.1 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.56 -r1.56.32.1 src/sys/arch/sun3/include/param3.h
cvs rdiff -u -r1.38 -r1.38.6.1 src/sys/arch/sun3/include/vmparam3.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.172.10.1 src/sys/arch/sun3/conf/GENERIC:1.172.10.2
--- src/sys/arch/sun3/conf/GENERIC:1.172.10.1 Fri Jan 26 14:28:13 2018
+++ src/sys/arch/sun3/conf/GENERIC Thu Apr 12 14:06:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172.10.1 2018/01/26 14:28:13 martin Exp $
+# $NetBSD: GENERIC,v 1.172.10.2 2018/04/12 14:06:14 martin Exp $
#
# GENERIC machine description file
#
@@ -23,9 +23,9 @@
include "arch/sun3/conf/std.sun3"
-options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.172.10.1 $"
+#ident "GENERIC-$Revision: 1.172.10.2 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -47,8 +47,8 @@ options SYSVSHM # System V shared memo
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
@@ -71,25 +71,26 @@ options DDB_HISTORY_SIZE=512 # enable h
#options SCSIVERBOSE # Verbose SCSI errors
# Compatibility options
-options COMPAT_SUNOS # can run SunOS 4.1.1 executables
+#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_SVR4 # can run SVR4 executables
options COMPAT_43 # and 4.3BSD and ...
-options COMPAT_10 # NetBSD 1.0,
-options COMPAT_11 # NetBSD 1.1,
-options COMPAT_12 # NetBSD 1.2,
-options COMPAT_13 # NetBSD 1.3,
-options COMPAT_14 # NetBSD 1.4,
-options COMPAT_15 # NetBSD 1.5,
-options COMPAT_16 # NetBSD 1.6,
-options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0,
-options COMPAT_40 # NetBSD 4.0,
-options COMPAT_50 # NetBSD 5.0,
+# Originally in NetBSD 1.0, but limited to 6.0 for size.
+#options COMPAT_10 # NetBSD 1.0,
+#options COMPAT_11 # NetBSD 1.1,
+#options COMPAT_12 # NetBSD 1.2,
+#options COMPAT_13 # NetBSD 1.3,
+#options COMPAT_14 # NetBSD 1.4,
+#options COMPAT_15 # NetBSD 1.5,
+#options COMPAT_16 # NetBSD 1.6,
+#options COMPAT_20 # NetBSD 2.0,
+#options COMPAT_30 # NetBSD 3.0,
+#options COMPAT_40 # NetBSD 4.0,
+#options COMPAT_50 # NetBSD 5.0,
options COMPAT_60 # NetBSD 6.0, and
options COMPAT_70 # NetBSD 7.0 binary compatibility.
-options COMPAT_AOUT_M68K # support for NetBSD a.out 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
+#options EXEC_AOUT # support for a.out executables
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -97,29 +98,30 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS client support
file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system FDESC # /dev/fd/*
-file-system KERNFS # /kern
+#file-system FDESC # /dev/fd/*
+#file-system KERNFS # /kern
file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
file-system PROCFS # /proc
#file-system UNION # union file system
file-system MFS # memory-based filesystem
file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+# Disabled as 20KB larger than MFS.
+#file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-options NFSSERVER # nfs server support
+#options NFSSERVER # nfs server support
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support
+#options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
#options UFS_EXTATTR # Extended attribute support for UFS1
# Networking options
options INET # IP protocol stack support
-options INET6 # IPV6
+#options INET6 # IPV6
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
@@ -255,8 +257,8 @@ uk* at scsibus? target ? lun ? # unknow
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
# Memory-disk drivers
pseudo-device md
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.126.10.1 src/sys/arch/sun3/conf/GENERIC3X:1.126.10.2
--- src/sys/arch/sun3/conf/GENERIC3X:1.126.10.1 Fri Jan 26 14:28:13 2018
+++ src/sys/arch/sun3/conf/GENERIC3X Thu Apr 12 14:06:14 2018
@@ -1,13 +1,13 @@
-# $NetBSD: GENERIC3X,v 1.126.10.1 2018/01/26 14:28:13 martin Exp $
+# $NetBSD: GENERIC3X,v 1.126.10.2 2018/04/12 14:06:14 martin Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
include "arch/sun3/conf/std.sun3x"
-options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.126.10.1 $"
+#ident "GENERIC3X-$Revision: 1.126.10.2 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -29,8 +29,8 @@ options SYSVSHM # System V shared memo
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
@@ -53,25 +53,26 @@ options DDB
#options SCSIVERBOSE # Verbose SCSI errors
# Compatibility options
-options COMPAT_SUNOS # can run SunOS 4.1.1 executables
+#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_SVR4 # can run SVR4 executables
options COMPAT_43 # and 4.3BSD and ...
-options COMPAT_10 # NetBSD 1.0,
-options COMPAT_11 # NetBSD 1.1,
-options COMPAT_12 # NetBSD 1.2,
-options COMPAT_13 # NetBSD 1.3,
-options COMPAT_14 # NetBSD 1.4,
-options COMPAT_15 # NetBSD 1.5,
-options COMPAT_16 # NetBSD 1.6,
-options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0,
-options COMPAT_40 # NetBSD 4.0,
-options COMPAT_50 # NetBSD 5.0,
+# Originally in NetBSD 1.0, but limited to 6.0 for size.
+#options COMPAT_10 # NetBSD 1.0,
+#options COMPAT_11 # NetBSD 1.1,
+#options COMPAT_12 # NetBSD 1.2,
+#options COMPAT_13 # NetBSD 1.3,
+#options COMPAT_14 # NetBSD 1.4,
+#options COMPAT_15 # NetBSD 1.5,
+#options COMPAT_16 # NetBSD 1.6,
+#options COMPAT_20 # NetBSD 2.0,
+#options COMPAT_30 # NetBSD 3.0,
+#options COMPAT_40 # NetBSD 4.0,
+#options COMPAT_50 # NetBSD 5.0,
options COMPAT_60 # NetBSD 6.0, and
options COMPAT_70 # NetBSD 7.0 binary compatibility.
-options COMPAT_AOUT_M68K # support for NetBSD a.out 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
+#options EXEC_AOUT # support for a.out executables
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -80,28 +81,29 @@ file-system FFS # Berkeley Fast Filesys
file-system NFS # Sun NFS client support
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS FAT file system
-file-system FDESC # /dev/fd/*
-file-system KERNFS # /kern
+#file-system FDESC # /dev/fd/*
+#file-system KERNFS # /kern
file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
file-system PROCFS # /proc
#file-system UNION # union file system
file-system MFS # memory-based filesystem
file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+# Disabled as 20KB larger than MFS.
+#file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-options NFSSERVER # nfs server support
+#options NFSSERVER # nfs server support
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support
+#options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
options INET # IP protocol stack support
-options INET6 # IPV6
+#options INET6 # IPV6
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
@@ -242,8 +244,8 @@ uk* at scsibus? target ? lun ? # unknow
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
# Memory-disk drivers
pseudo-device md
Index: src/sys/arch/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.104 src/sys/arch/sun3/conf/Makefile.sun3:1.104.10.1
--- src/sys/arch/sun3/conf/Makefile.sun3:1.104 Wed Apr 15 19:13:47 2015
+++ src/sys/arch/sun3/conf/Makefile.sun3 Thu Apr 12 14:06:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.104 2015/04/15 19:13:47 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.104.10.1 2018/04/12 14:06:14 martin Exp $
# Makefile for NetBSD
#
@@ -39,7 +39,14 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
+OPT_MODULAR= %MODULAR%
+.if !empty(OPT_MODULAR)
KERN_AS= obj
+COMPAT_AS= obj
+.else
+KERN_AS= library
+COMPAT_AS= library
+.endif
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/sun3/include/param3.h
diff -u src/sys/arch/sun3/include/param3.h:1.56 src/sys/arch/sun3/include/param3.h:1.56.32.1
--- src/sys/arch/sun3/include/param3.h:1.56 Sun Aug 12 20:00:06 2012
+++ src/sys/arch/sun3/include/param3.h Thu Apr 12 14:06:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: param3.h,v 1.56 2012/08/12 20:00:06 tsutsui Exp $ */
+/* $NetBSD: param3.h,v 1.56.32.1 2018/04/12 14:06:14 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -53,4 +53,5 @@
#define NKMEMPAGES_MAX_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT)
/* Use smaller UBC_NWINS to avoid KVA space shortage. */
-#define UBC_NWINS 512
+#define UBC_NWINS 128
+#define MAXEXEC 1
Index: src/sys/arch/sun3/include/vmparam3.h
diff -u src/sys/arch/sun3/include/vmparam3.h:1.38 src/sys/arch/sun3/include/vmparam3.h:1.38.6.1
--- src/sys/arch/sun3/include/vmparam3.h:1.38 Thu Feb 2 21:53:55 2017
+++ src/sys/arch/sun3/include/vmparam3.h Thu Apr 12 14:06:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam3.h,v 1.38 2017/02/02 21:53:55 rin Exp $ */
+/* $NetBSD: vmparam3.h,v 1.38.6.1 2018/04/12 14:06:14 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -112,4 +112,4 @@
#define MAXSSIZ MAXDSIZ /* max stack size */
#endif
-#define PAGER_MAP_DEFAULT_SIZE (4 * 1024 * 1024)
+#define PAGER_MAP_DEFAULT_SIZE (2 * 1024 * 1024)
