Module Name: src
Committed By: rin
Date: Sat Sep 22 12:24:04 UTC 2018
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
src/sys/arch/acorn32/conf: Makefile.acorn32
src/sys/arch/alpha/conf: Makefile.alpha
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/amiga/conf: Makefile.amiga
src/sys/arch/arm/conf: Makefile.arm
src/sys/arch/atari/conf: Makefile.atari
src/sys/arch/cesfic/conf: Makefile.cesfic
src/sys/arch/hp300/conf: Makefile.hp300
src/sys/arch/hpcarm/conf: Makefile.hpcarm
src/sys/arch/hppa/conf: Makefile.hppa
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/ia64/conf: Makefile.ia64
src/sys/arch/luna68k/conf: Makefile.luna68k
src/sys/arch/mac68k/conf: Makefile.mac68k
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/mvme68k/conf: Makefile.mvme68k
src/sys/arch/news68k/conf: Makefile.news68k
src/sys/arch/next68k/conf: Makefile.next68k
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/riscv/conf: Makefile.riscv
src/sys/arch/sh3/conf: Makefile.sh3
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/arch/sun2/conf: Makefile.sun2
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/vax/conf: Makefile.vax
src/sys/arch/x68k/conf: Makefile.x68k
src/sys/arch/xen/conf: Makefile.xen
src/sys/conf: Makefile.kern.inc
src/sys/lib/libkern: Makefile.inc
Log Message:
- Determine KERN_AS automatically depending on whether OPT_MODULAR is
set or not, in the same way as libcompat.
- Specify OPT_MODULAR in the port Makefile instead of KERN_AS.
Now, KERN_AS=library is used for kernels without module(7) for all ports.
OK christos
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/acorn32/conf/Makefile.acorn32
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/alpha/conf/Makefile.alpha
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/Makefile.amiga
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/conf/Makefile.arm
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/atari/conf/Makefile.atari
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/conf/Makefile.cesfic
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/hp300/conf/Makefile.hp300
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/conf/Makefile.hpcarm
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/conf/Makefile.hppa
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/Makefile.ia64
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/mac68k/conf/Makefile.mac68k
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/mvme68k/conf/Makefile.mvme68k
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/news68k/conf/Makefile.news68k
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/next68k/conf/Makefile.next68k
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/Makefile.riscv
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sh3/conf/Makefile.sh3
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun2/conf/Makefile.sun2
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/vax/conf/Makefile.vax
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x68k/conf/Makefile.x68k
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.265 -r1.266 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.45 -r1.46 src/sys/lib/libkern/Makefile.inc
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/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.11 src/sys/arch/aarch64/conf/Makefile.aarch64:1.12
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.11 Fri Sep 14 08:51:06 2018
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.11 2018/09/14 08:51:06 skrll Exp $
+# $NetBSD: Makefile.aarch64,v 1.12 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -43,7 +43,7 @@ CFLAGS+= -mno-omit-leaf-frame-pointer
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/acorn32/conf/Makefile.acorn32
diff -u src/sys/arch/acorn32/conf/Makefile.acorn32:1.23 src/sys/arch/acorn32/conf/Makefile.acorn32:1.24
--- src/sys/arch/acorn32/conf/Makefile.acorn32:1.23 Sun Oct 19 22:05:21 2008
+++ src/sys/arch/acorn32/conf/Makefile.acorn32 Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn32,v 1.23 2008/10/19 22:05:21 apb Exp $
+# $NetBSD: Makefile.acorn32,v 1.24 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -39,7 +39,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (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.84 src/sys/arch/alpha/conf/Makefile.alpha:1.85
--- src/sys/arch/alpha/conf/Makefile.alpha:1.84 Wed Jan 20 12:49:21 2016
+++ src/sys/arch/alpha/conf/Makefile.alpha Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.alpha,v 1.84 2016/01/20 12:49:21 jklos Exp $
+# $NetBSD: Makefile.alpha,v 1.85 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -42,11 +42,6 @@ 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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.73 src/sys/arch/amd64/conf/Makefile.amd64:1.74
--- src/sys/arch/amd64/conf/Makefile.amd64:1.73 Wed Aug 22 12:07:42 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.73 2018/08/22 12:07:42 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.74 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -63,11 +63,6 @@ CFLAGS+= ${KASANFLAGS.${.IMPSRC:T}:U${KA
## (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/amiga/conf/Makefile.amiga
diff -u src/sys/arch/amiga/conf/Makefile.amiga:1.110 src/sys/arch/amiga/conf/Makefile.amiga:1.111
--- src/sys/arch/amiga/conf/Makefile.amiga:1.110 Mon Mar 5 02:41:03 2018
+++ src/sys/arch/amiga/conf/Makefile.amiga Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amiga,v 1.110 2018/03/05 02:41:03 christos Exp $
+# $NetBSD: Makefile.amiga,v 1.111 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -42,7 +42,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.48 src/sys/arch/arm/conf/Makefile.arm:1.49
--- src/sys/arch/arm/conf/Makefile.arm:1.48 Fri May 1 02:00:41 2015
+++ src/sys/arch/arm/conf/Makefile.arm Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.48 2015/05/01 02:00:41 nat Exp $
+# $NetBSD: Makefile.arm,v 1.49 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -56,8 +56,7 @@ CPPFLAGS.cpufunc_asm_xscale.S+= -mcpu=xs
##
## (3) libkern and compat
##
-KERN_AS= obj
-
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/atari/conf/Makefile.atari
diff -u src/sys/arch/atari/conf/Makefile.atari:1.77 src/sys/arch/atari/conf/Makefile.atari:1.78
--- src/sys/arch/atari/conf/Makefile.atari:1.77 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/atari/conf/Makefile.atari Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.atari,v 1.77 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.atari,v 1.78 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -37,7 +37,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/cesfic/conf/Makefile.cesfic
diff -u src/sys/arch/cesfic/conf/Makefile.cesfic:1.19 src/sys/arch/cesfic/conf/Makefile.cesfic:1.20
--- src/sys/arch/cesfic/conf/Makefile.cesfic:1.19 Sun Sep 6 02:17:30 2015
+++ src/sys/arch/cesfic/conf/Makefile.cesfic Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cesfic,v 1.19 2015/09/06 02:17:30 uebayasi Exp $
+# $NetBSD: Makefile.cesfic,v 1.20 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -40,7 +40,7 @@ AFLAGS+= -Wa,-mcpu=68030 -Wa,-m68040 -Wa
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/hp300/conf/Makefile.hp300
diff -u src/sys/arch/hp300/conf/Makefile.hp300:1.93 src/sys/arch/hp300/conf/Makefile.hp300:1.94
--- src/sys/arch/hp300/conf/Makefile.hp300:1.93 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/hp300/conf/Makefile.hp300 Sat Sep 22 12:24:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp300,v 1.93 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.hp300,v 1.94 2018/09/22 12:24:01 rin Exp $
# Makefile for NetBSD
#
@@ -38,7 +38,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/hpcarm/conf/Makefile.hpcarm
diff -u src/sys/arch/hpcarm/conf/Makefile.hpcarm:1.18 src/sys/arch/hpcarm/conf/Makefile.hpcarm:1.19
--- src/sys/arch/hpcarm/conf/Makefile.hpcarm:1.18 Mon Feb 18 13:29:46 2008
+++ src/sys/arch/hpcarm/conf/Makefile.hpcarm Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hpcarm,v 1.18 2008/02/18 13:29:46 joerg Exp $
+# $NetBSD: Makefile.hpcarm,v 1.19 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -39,7 +39,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/hppa/conf/Makefile.hppa
diff -u src/sys/arch/hppa/conf/Makefile.hppa:1.5 src/sys/arch/hppa/conf/Makefile.hppa:1.6
--- src/sys/arch/hppa/conf/Makefile.hppa:1.5 Sun Sep 6 02:22:50 2015
+++ src/sys/arch/hppa/conf/Makefile.hppa Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hppa,v 1.5 2015/09/06 02:22:50 uebayasi Exp $
+# $NetBSD: Makefile.hppa,v 1.6 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -52,7 +52,7 @@ CFLAGS+= -fno-omit-frame-pointer
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.193 src/sys/arch/i386/conf/Makefile.i386:1.194
--- src/sys/arch/i386/conf/Makefile.i386:1.193 Tue Jun 5 00:58:42 2018
+++ src/sys/arch/i386/conf/Makefile.i386 Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.193 2018/06/05 00:58:42 christos Exp $
+# $NetBSD: Makefile.i386,v 1.194 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -49,11 +49,6 @@ CFLAGS+= -mindirect-branch-register
## (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/ia64/conf/Makefile.ia64
diff -u src/sys/arch/ia64/conf/Makefile.ia64:1.5 src/sys/arch/ia64/conf/Makefile.ia64:1.6
--- src/sys/arch/ia64/conf/Makefile.ia64:1.5 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/ia64/conf/Makefile.ia64 Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ia64,v 1.5 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.ia64,v 1.6 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -37,7 +37,7 @@ AFLAGS+= -x assembler-with-cpp -Wa,-x
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (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.28 src/sys/arch/luna68k/conf/Makefile.luna68k:1.29
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.28 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.28 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.luna68k,v 1.29 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -38,11 +38,6 @@ 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/mac68k/conf/Makefile.mac68k
diff -u src/sys/arch/mac68k/conf/Makefile.mac68k:1.92 src/sys/arch/mac68k/conf/Makefile.mac68k:1.93
--- src/sys/arch/mac68k/conf/Makefile.mac68k:1.92 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/mac68k/conf/Makefile.mac68k Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mac68k,v 1.92 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.mac68k,v 1.93 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -38,7 +38,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (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.68 src/sys/arch/mips/conf/Makefile.mips:1.69
--- src/sys/arch/mips/conf/Makefile.mips:1.68 Tue Jun 5 11:39:49 2018
+++ src/sys/arch/mips/conf/Makefile.mips Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.68 2018/06/05 11:39:49 christos Exp $
+# $NetBSD: Makefile.mips,v 1.69 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -79,11 +79,6 @@ AFLAGS+= -mno-abicalls -x assembler-with
## (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/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.67 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.68
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.67 Thu Mar 8 03:12:02 2018
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mvme68k,v 1.67 2018/03/08 03:12:02 mrg Exp $
+# $NetBSD: Makefile.mvme68k,v 1.68 2018/09/22 12:24:02 rin Exp $
# Makefile for NetBSD
#
@@ -51,7 +51,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/news68k/conf/Makefile.news68k
diff -u src/sys/arch/news68k/conf/Makefile.news68k:1.21 src/sys/arch/news68k/conf/Makefile.news68k:1.22
--- src/sys/arch/news68k/conf/Makefile.news68k:1.21 Sun Sep 6 02:17:31 2015
+++ src/sys/arch/news68k/conf/Makefile.news68k Sat Sep 22 12:24:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.news68k,v 1.21 2015/09/06 02:17:31 uebayasi Exp $
+# $NetBSD: Makefile.news68k,v 1.22 2018/09/22 12:24:02 rin Exp $
#
# Makefile for NetBSD
#
@@ -41,7 +41,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/next68k/conf/Makefile.next68k
diff -u src/sys/arch/next68k/conf/Makefile.next68k:1.31 src/sys/arch/next68k/conf/Makefile.next68k:1.32
--- src/sys/arch/next68k/conf/Makefile.next68k:1.31 Sun Sep 6 02:17:31 2015
+++ src/sys/arch/next68k/conf/Makefile.next68k Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.next68k,v 1.31 2015/09/06 02:17:31 uebayasi Exp $
+# $NetBSD: Makefile.next68k,v 1.32 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -38,7 +38,7 @@ AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.60 src/sys/arch/powerpc/conf/Makefile.powerpc:1.61
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.60 Sat Feb 27 21:48:34 2016
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.60 2016/02/27 21:48:34 joerg Exp $
+# $NetBSD: Makefile.powerpc,v 1.61 2018/09/22 12:24:03 rin Exp $
#
# Makefile for NetBSD
#
@@ -57,11 +57,6 @@ AFLAGS+= ${AOPTS} -D_NOREGNAMES
## (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/riscv/conf/Makefile.riscv
diff -u src/sys/arch/riscv/conf/Makefile.riscv:1.2 src/sys/arch/riscv/conf/Makefile.riscv:1.3
--- src/sys/arch/riscv/conf/Makefile.riscv:1.2 Tue Mar 31 01:05:52 2015
+++ src/sys/arch/riscv/conf/Makefile.riscv Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.riscv,v 1.2 2015/03/31 01:05:52 matt Exp $
+# $NetBSD: Makefile.riscv,v 1.3 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -55,11 +55,6 @@ AFLAGS+= -x assembler-with-cpp ${AOPTS}
## (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/sh3/conf/Makefile.sh3
diff -u src/sys/arch/sh3/conf/Makefile.sh3:1.28 src/sys/arch/sh3/conf/Makefile.sh3:1.29
--- src/sys/arch/sh3/conf/Makefile.sh3:1.28 Sun Mar 10 07:18:21 2013
+++ src/sys/arch/sh3/conf/Makefile.sh3 Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sh3,v 1.28 2013/03/10 07:18:21 christos Exp $
+# $NetBSD: Makefile.sh3,v 1.29 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -41,11 +41,6 @@ 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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.95 src/sys/arch/sparc/conf/Makefile.sparc:1.96
--- src/sys/arch/sparc/conf/Makefile.sparc:1.95 Sat Dec 3 16:00:10 2016
+++ src/sys/arch/sparc/conf/Makefile.sparc Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.95 2016/12/03 16:00:10 christos Exp $
+# $NetBSD: Makefile.sparc,v 1.96 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -44,7 +44,7 @@ COPTS.kern_timeout.c += -Wno-stack-prote
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (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.84 src/sys/arch/sparc64/conf/Makefile.sparc64:1.85
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.84 Sun Dec 10 14:29:47 2017
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.84 2017/12/10 14:29:47 christos Exp $
+# $NetBSD: Makefile.sparc64,v 1.85 2018/09/22 12:24:03 rin Exp $
#=========================================================================
#
@@ -83,11 +83,6 @@ 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/sun2/conf/Makefile.sun2
diff -u src/sys/arch/sun2/conf/Makefile.sun2:1.23 src/sys/arch/sun2/conf/Makefile.sun2:1.24
--- src/sys/arch/sun2/conf/Makefile.sun2:1.23 Sat Sep 22 12:05:52 2018
+++ src/sys/arch/sun2/conf/Makefile.sun2 Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun2,v 1.23 2018/09/22 12:05:52 rin Exp $
+# $NetBSD: Makefile.sun2,v 1.24 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -39,11 +39,6 @@ AFLAGS+= -x assembler-with-cpp
## (3) libkern and compat
##
OPT_MODULAR= %MODULAR%
-.if !empty(OPT_MODULAR)
-KERN_AS= obj
-.else
-KERN_AS= library
-.endif
# XXX lib/libkern/arch/m68k/Makefile.inc needs to know that
# XXX our MACHINE_ARCH is m68000, and not m68k. --fredette
KERNMISCMAKEFLAGS= MACHINE_ARCH=${MACHINE_ARCH}
Index: src/sys/arch/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.108 src/sys/arch/sun3/conf/Makefile.sun3:1.109
--- src/sys/arch/sun3/conf/Makefile.sun3:1.108 Sat Sep 22 12:05:52 2018
+++ src/sys/arch/sun3/conf/Makefile.sun3 Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.108 2018/09/22 12:05:52 rin Exp $
+# $NetBSD: Makefile.sun3,v 1.109 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -40,11 +40,6 @@ 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/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.43 src/sys/arch/usermode/conf/Makefile.usermode:1.44
--- src/sys/arch/usermode/conf/Makefile.usermode:1.43 Fri Aug 17 20:16:07 2018
+++ src/sys/arch/usermode/conf/Makefile.usermode Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.43 2018/08/17 20:16:07 reinoud Exp $
+# $NetBSD: Makefile.usermode,v 1.44 2018/09/22 12:24:03 rin Exp $
MKCTF?= no
USETOOLS?= no
@@ -50,8 +50,7 @@ CPPFLAGS.thunk.c+= ${USERMODE_CPPFLAGS}
##
## (3) libkern and compat
##
-KERN_AS= library
-COMPAT_AS= library
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/vax/conf/Makefile.vax
diff -u src/sys/arch/vax/conf/Makefile.vax:1.83 src/sys/arch/vax/conf/Makefile.vax:1.84
--- src/sys/arch/vax/conf/Makefile.vax:1.83 Sat Jun 14 20:49:37 2014
+++ src/sys/arch/vax/conf/Makefile.vax Sat Sep 22 12:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.83 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile.vax,v 1.84 2018/09/22 12:24:03 rin Exp $
# Makefile for NetBSD
#
@@ -38,7 +38,7 @@ CFLAGS+= -fno-pic
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/x68k/conf/Makefile.x68k
diff -u src/sys/arch/x68k/conf/Makefile.x68k:1.65 src/sys/arch/x68k/conf/Makefile.x68k:1.66
--- src/sys/arch/x68k/conf/Makefile.x68k:1.65 Sun Feb 25 00:27:16 2018
+++ src/sys/arch/x68k/conf/Makefile.x68k Sat Sep 22 12:24:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.x68k,v 1.65 2018/02/25 00:27:16 mrg Exp $
+# $NetBSD: Makefile.x68k,v 1.66 2018/09/22 12:24:04 rin Exp $
#
# Makefile for NetBSD
#
@@ -39,7 +39,7 @@ CFLAGS+= ${CMACHFLAGS} -msoft-float
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.46 src/sys/arch/xen/conf/Makefile.xen:1.47
--- src/sys/arch/xen/conf/Makefile.xen:1.46 Sat Jun 2 18:11:26 2018
+++ src/sys/arch/xen/conf/Makefile.xen Sat Sep 22 12:24:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.46 2018/06/02 18:11:26 christos Exp $
+# $NetBSD: Makefile.xen,v 1.47 2018/09/22 12:24:04 rin Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -62,7 +62,7 @@ CFLAGS+= -mno-mmx -mno-sse -mno-avx
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.265 src/sys/conf/Makefile.kern.inc:1.266
--- src/sys/conf/Makefile.kern.inc:1.265 Mon Aug 27 05:35:22 2018
+++ src/sys/conf/Makefile.kern.inc Sat Sep 22 12:24:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.265 2018/08/27 05:35:22 riastradh Exp $
+# $NetBSD: Makefile.kern.inc,v 1.266 2018/09/22 12:24:04 rin Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -157,8 +157,8 @@ LINK_O?= @${_MKSHMSG} " link ${.CURDI
##
## (3) libkern and compat
##
-## Set KERN_AS in the port Makefile to "obj" or "library". The
-## default is "library", as documented in $S/lib/libkern/Makefile.inc.
+## Set OPT_MODULAR in the port Makefile if module(7) is enabled,
+## as documented in $S/lib/libkern/Makefile.inc.
##
### find out what to use for libkern
Index: src/sys/lib/libkern/Makefile.inc
diff -u src/sys/lib/libkern/Makefile.inc:1.45 src/sys/lib/libkern/Makefile.inc:1.46
--- src/sys/lib/libkern/Makefile.inc:1.45 Sun May 27 01:14:50 2018
+++ src/sys/lib/libkern/Makefile.inc Sat Sep 22 12:24:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.45 2018/05/27 01:14:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.46 2018/09/22 12:24:04 rin Exp $
#
# Configuration variables (default values are below):
#
@@ -7,7 +7,8 @@
# objects are to be built. Defaults to ${.OBJDIR}/lib/kern.
# KERN_AS may be set to 'obj' to build a object from the library's
# object files. (Otherwise, a library will be built.)
-# Defaults to 'library'.
+# Defaults to 'obj' if OPT_MODULAR is set. Otherwise,
+# 'library' is used as a default value.
# KERNMISCCPPFLAGS
# Miscellaneous cpp flags to be passed to the library's Makefile
# when building.
@@ -18,7 +19,11 @@
# Default values:
KERNDST?= ${.OBJDIR}/lib/kern
+.if !empty(OPT_MODULAR)
+KERN_AS?= obj
+.else
KERN_AS?= library
+.endif
KERNDOTDIR?= ../../.
KERNDIR= ${S:S@^.@${KERNDOTDIR}@:q}/lib/libkern
