Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x68k/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x68k/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.172
retrieving revision 1.172.2.1
diff -u -p -r1.172 -r1.172.2.1
--- src/sys/arch/x68k/conf/GENERIC	2014/03/24 14:15:38	1.172
+++ src/sys/arch/x68k/conf/GENERIC	2014/08/10 06:54:10	1.172.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC,v 1.172.2.1 2014/08/10 06:54:10 tls Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,9 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.172 $"
+#ident 		"GENERIC-$Revision: 1.172.2.1 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	8
 
@@ -78,7 +80,7 @@ options 	SYSVSEM		# System V semaphores
 options 	SYSVSHM		# System V shared memory
 
 ## Loadable kernel module support
-#options 	MODULAR		# new style module(7) framework
+options 	MODULAR		# new style module(7) framework
 
 options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
@@ -173,11 +175,11 @@ options 	COMPAT_BSDPTY	# /dev/[pt]ty?? p
 file-system	FFS		# Berkeley Fast Filesystem
 file-system	NFS		# Sun NFS-compatible filesystem client
 file-system	KERNFS		# kernel data-structure filesystem
-#file-system	NULLFS		# NULL layered filesystem
+file-system	NULLFS		# NULL layered filesystem
 #file-system 	OVERLAY		# overlay file system
 file-system	MFS		# memory-based filesystem
 #file-system	FDESC		# user file descriptor filesystem
-file-system	UMAPFS		# uid/gid remapping filesystem
+#file-system	UMAPFS		# uid/gid remapping filesystem
 #file-system	LFS		# Log-structured filesystem (experimental)
 file-system	PROCFS		# /proc
 file-system	CD9660		# ISO 9660 + Rock Ridge file system
@@ -426,8 +428,8 @@ bmd*	at intio0 addr 0xecebf0		# Nereid
 
 #
 # 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
 
 ## A disk-like interface to files.  Can be used to create floppy, CD,
 ## miniroot images, etc.