Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Explicitly set KERN_AS (this could be done in /usr/...



details:   https://anonhg.NetBSD.org/src/rev/8be64fd488eb
branches:  trunk
changeset: 785346:8be64fd488eb
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 10 07:18:19 2013 +0000

description:
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.

diffstat:

 sys/arch/acorn26/conf/Makefile.acorn26 |  8 +++++++-
 sys/arch/alpha/conf/Makefile.alpha     |  8 +++++++-
 sys/arch/luna68k/conf/Makefile.luna68k |  8 +++++++-
 sys/arch/mips/conf/Makefile.mips       |  4 +++-
 sys/arch/powerpc/conf/Makefile.powerpc |  4 +++-
 sys/arch/sh3/conf/Makefile.sh3         |  8 +++++++-
 sys/arch/sparc64/conf/Makefile.sparc64 |  9 +++++++--
 7 files changed, 41 insertions(+), 8 deletions(-)

diffs (147 lines):

diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/acorn26/conf/Makefile.acorn26
--- a/sys/arch/acorn26/conf/Makefile.acorn26    Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/acorn26/conf/Makefile.acorn26    Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 ##
 ## (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
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/alpha/conf/Makefile.alpha
--- a/sys/arch/alpha/conf/Makefile.alpha        Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/alpha/conf/Makefile.alpha        Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 ##
 ## (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
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k    Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k    Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 ##
 ## (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
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips  Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/mips/conf/Makefile.mips  Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 OPT_MODULAR=   %MODULAR%
 .if !empty(OPT_MODULAR)
 KERN_AS=       obj
+.else
+KERN_AS=       library
 .endif
 
 ##
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 OPT_MODULAR=   %MODULAR%
 .if !empty(OPT_MODULAR)
 KERN_AS=       obj
+.else
+KERN_AS=       library
 .endif
 
 ##
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/sh3/conf/Makefile.sh3
--- a/sys/arch/sh3/conf/Makefile.sh3    Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/sh3/conf/Makefile.sh3    Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 ##
 ## (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
diff -r d1db4e6fd63a -r 8be64fd488eb sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Sun Mar 10 04:25:06 2013 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Sun Mar 10 07:18:19 2013 +0000
@@ -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 @@
 ##
 ## (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



Home | Main Index | Thread Index | Old Index