Module Name: src
Committed By: christos
Date: Sun Mar 10 07:18:21 UTC 2013
Modified Files:
src/sys/arch/acorn26/conf: Makefile.acorn26
src/sys/arch/alpha/conf: Makefile.alpha
src/sys/arch/luna68k/conf: Makefile.luna68k
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/sh3/conf: Makefile.sh3
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Explicitly set KERN_AS (this could be done in /usr/src/sys/conf/Makefile.*)
so that modules work, on config files that did not set it explicitly. All
the files now use the standard logic, except the ones that set KERN_AS=obj
and Makefile.usermode which sets KERN_AS=library.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn26/conf/Makefile.acorn26
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/alpha/conf/Makefile.alpha
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sh3/conf/Makefile.sh3
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc64/conf/Makefile.sparc64
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/acorn26/conf/Makefile.acorn26
diff -u src/sys/arch/acorn26/conf/Makefile.acorn26:1.11 src/sys/arch/acorn26/conf/Makefile.acorn26:1.12
--- src/sys/arch/acorn26/conf/Makefile.acorn26:1.11 Fri Jan 21 10:59:04 2011
+++ src/sys/arch/acorn26/conf/Makefile.acorn26 Sun Mar 10 03:18:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn26,v 1.11 2011/01/21 15:59:04 joerg Exp $
+# $NetBSD: Makefile.acorn26,v 1.12 2013/03/10 07:18:19 christos Exp $
# Makefile for NetBSD
#
@@ -41,6 +41,12 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
+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/alpha/conf/Makefile.alpha
diff -u src/sys/arch/alpha/conf/Makefile.alpha:1.82 src/sys/arch/alpha/conf/Makefile.alpha:1.83
--- src/sys/arch/alpha/conf/Makefile.alpha:1.82 Sun Nov 8 23:03:19 2009
+++ src/sys/arch/alpha/conf/Makefile.alpha Sun Mar 10 03:18:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.alpha,v 1.82 2009/11/09 04:03:19 mhitch Exp $
+# $NetBSD: Makefile.alpha,v 1.83 2013/03/10 07:18:20 christos Exp $
# Makefile for NetBSD
#
@@ -41,6 +41,12 @@ NORMAL_S= ${CPP} ${AFLAGS} ${CPPFLAGS} $
##
## (3) libkern and compat
##
+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/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.23 src/sys/arch/luna68k/conf/Makefile.luna68k:1.24
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.23 Sat Nov 12 08:44:26 2011
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Sun Mar 10 03:18:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.23 2011/11/12 13:44:26 tsutsui Exp $
+# $NetBSD: Makefile.luna68k,v 1.24 2013/03/10 07:18:20 christos Exp $
# Makefile for NetBSD
#
@@ -37,6 +37,12 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
+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/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.58 src/sys/arch/mips/conf/Makefile.mips:1.59
--- src/sys/arch/mips/conf/Makefile.mips:1.58 Sun Feb 20 02:45:46 2011
+++ src/sys/arch/mips/conf/Makefile.mips Sun Mar 10 03:18:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.58 2011/02/20 07:45:46 matt Exp $
+# $NetBSD: Makefile.mips,v 1.59 2013/03/10 07:18:20 christos Exp $
# Makefile for NetBSD
#
@@ -75,6 +75,8 @@ AFLAGS+= -mno-abicalls -x assembler-with
OPT_MODULAR= %MODULAR%
.if !empty(OPT_MODULAR)
KERN_AS= obj
+.else
+KERN_AS= library
.endif
##
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.50 src/sys/arch/powerpc/conf/Makefile.powerpc:1.51
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.50 Wed Mar 21 18:29:21 2012
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sun Mar 10 03:18:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.50 2012/03/21 22:29:21 matt Exp $
+# $NetBSD: Makefile.powerpc,v 1.51 2013/03/10 07:18:20 christos Exp $
#
# Makefile for NetBSD
#
@@ -58,6 +58,8 @@ AFLAGS+= ${AOPTS} -D_NOREGNAMES
OPT_MODULAR= %MODULAR%
.if !empty(OPT_MODULAR)
KERN_AS= obj
+.else
+KERN_AS= library
.endif
##
Index: src/sys/arch/sh3/conf/Makefile.sh3
diff -u src/sys/arch/sh3/conf/Makefile.sh3:1.27 src/sys/arch/sh3/conf/Makefile.sh3:1.28
--- src/sys/arch/sh3/conf/Makefile.sh3:1.27 Fri Jan 21 10:59:09 2011
+++ src/sys/arch/sh3/conf/Makefile.sh3 Sun Mar 10 03:18:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sh3,v 1.27 2011/01/21 15:59:09 joerg Exp $
+# $NetBSD: Makefile.sh3,v 1.28 2013/03/10 07:18:21 christos Exp $
# Makefile for NetBSD
#
@@ -40,6 +40,12 @@ COPTS?= -Os -freorder-blocks
##
## (3) libkern and compat
##
+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/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.71 src/sys/arch/sparc64/conf/Makefile.sparc64:1.72
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.71 Fri Mar 2 22:21:16 2012
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sun Mar 10 03:18:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.71 2012/03/03 03:21:16 nakayama Exp $
+# $NetBSD: Makefile.sparc64,v 1.72 2013/03/10 07:18:21 christos Exp $
#=========================================================================
#
@@ -75,7 +75,12 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-# KERN_AS= obj # memcpy, memset, etc. are in locore.s
+OPT_MODULAR= %MODULAR%
+.if !empty(OPT_MODULAR)
+KERN_AS= obj
+.else
+KERN_AS= library
+.endif
##
## (4) local objects, compile rules, and dependencies
