Module Name:    src
Committed By:   mrg
Date:           Sat Mar  3 03:19:36 UTC 2018

Modified Files:
        src/sys/arch/sun3/conf: GENERIC Makefile.sun3
        src/sys/arch/sun3/include: param3.h vmparam3.h

Log Message:
sun2/sun3:
- build libkern as an archive for non modular builds.  from maya@
sun3:
- 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.


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sun3/include/param3.h
cvs rdiff -u -r1.38 -r1.39 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.176 src/sys/arch/sun3/conf/GENERIC:1.177
--- src/sys/arch/sun3/conf/GENERIC:1.176	Tue Jan 23 14:47:56 2018
+++ src/sys/arch/sun3/conf/GENERIC	Sat Mar  3 03:19:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.176 2018/01/23 14:47:56 sevan Exp $
+# $NetBSD: GENERIC,v 1.177 2018/03/03 03:19:36 mrg 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.176 $"
+#ident		"GENERIC-$Revision: 1.177 $"
 
 makeoptions	COPTS="-Os"		# bootloader has size limit (~2MB)
 
@@ -47,7 +47,7 @@ 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 	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
@@ -71,41 +71,44 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	SCSIVERBOSE		# Verbose SCSI errors
 
 # Compatibility options
-include 	"conf/compat_netbsd10.config"
+# Originally in NetBSD 1.0, but limited to 6.0 for size.
+#include 	"conf/compat_netbsd10.config"
+include 	"conf/compat_netbsd60.config"
 
-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_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
 
 # Filesystem options
 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
@@ -241,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.105 src/sys/arch/sun3/conf/Makefile.sun3:1.106
--- src/sys/arch/sun3/conf/Makefile.sun3:1.105	Sun Feb 25 00:27:16 2018
+++ src/sys/arch/sun3/conf/Makefile.sun3	Sat Mar  3 03:19:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.105 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.106 2018/03/03 03:19:36 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -39,7 +39,12 @@ AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
-KERN_AS=	obj
+OPT_MODULAR=   %MODULAR%
+.if !empty(OPT_MODULAR)
+KERN_AS=       obj
+.else
+KERN_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.57
--- src/sys/arch/sun3/include/param3.h:1.56	Sun Aug 12 20:00:06 2012
+++ src/sys/arch/sun3/include/param3.h	Sat Mar  3 03:19:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: param3.h,v 1.56 2012/08/12 20:00:06 tsutsui Exp $	*/
+/*	$NetBSD: param3.h,v 1.57 2018/03/03 03:19:36 mrg 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.39
--- src/sys/arch/sun3/include/vmparam3.h:1.38	Thu Feb  2 21:53:55 2017
+++ src/sys/arch/sun3/include/vmparam3.h	Sat Mar  3 03:19:36 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam3.h,v 1.38 2017/02/02 21:53:55 rin Exp $	*/
+/*	$NetBSD: vmparam3.h,v 1.39 2018/03/03 03:19:36 mrg 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)

Reply via email to