summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorrin <rin@NetBSD.org>2018-09-22 12:24:01 +0000
committerrin <rin@NetBSD.org>2018-09-22 12:24:01 +0000
commit78bb4e0433d2d2e91f5437c53ebbf8ece989392e (patch)
treeb00efc605ed07fb4fbe9f53ce1f73e803565e235 /sys/arch
parent18a9434357d36a188f19d75feb8fd61094a32c03 (diff)
- 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
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/aarch64/conf/Makefile.aarch644
-rw-r--r--sys/arch/acorn32/conf/Makefile.acorn324
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha7
-rw-r--r--sys/arch/amd64/conf/Makefile.amd647
-rw-r--r--sys/arch/amiga/conf/Makefile.amiga4
-rw-r--r--sys/arch/arm/conf/Makefile.arm5
-rw-r--r--sys/arch/atari/conf/Makefile.atari4
-rw-r--r--sys/arch/cesfic/conf/Makefile.cesfic4
-rw-r--r--sys/arch/hp300/conf/Makefile.hp3004
-rw-r--r--sys/arch/hpcarm/conf/Makefile.hpcarm4
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa4
-rw-r--r--sys/arch/i386/conf/Makefile.i3867
-rw-r--r--sys/arch/ia64/conf/Makefile.ia644
-rw-r--r--sys/arch/luna68k/conf/Makefile.luna68k7
-rw-r--r--sys/arch/mac68k/conf/Makefile.mac68k4
-rw-r--r--sys/arch/mips/conf/Makefile.mips7
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k4
-rw-r--r--sys/arch/news68k/conf/Makefile.news68k4
-rw-r--r--sys/arch/next68k/conf/Makefile.next68k4
-rw-r--r--sys/arch/powerpc/conf/Makefile.powerpc7
-rw-r--r--sys/arch/riscv/conf/Makefile.riscv7
-rw-r--r--sys/arch/sh3/conf/Makefile.sh37
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc4
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc647
-rw-r--r--sys/arch/sun2/conf/Makefile.sun27
-rw-r--r--sys/arch/sun3/conf/Makefile.sun37
-rw-r--r--sys/arch/usermode/conf/Makefile.usermode5
-rw-r--r--sys/arch/vax/conf/Makefile.vax4
-rw-r--r--sys/arch/x68k/conf/Makefile.x68k4
-rw-r--r--sys/arch/xen/conf/Makefile.xen4
30 files changed, 49 insertions, 106 deletions
diff --git a/sys/arch/aarch64/conf/Makefile.aarch64 b/sys/arch/aarch64/conf/Makefile.aarch64
index 544dfd38180..24ae2bb619a 100644
--- a/sys/arch/aarch64/conf/Makefile.aarch64
+++ b/sys/arch/aarch64/conf/Makefile.aarch64
@@ -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
diff --git a/sys/arch/acorn32/conf/Makefile.acorn32 b/sys/arch/acorn32/conf/Makefile.acorn32
index ad15590138a..82e539684a0 100644
--- a/sys/arch/acorn32/conf/Makefile.acorn32
+++ b/sys/arch/acorn32/conf/Makefile.acorn32
@@ -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
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index a4c167764c2..e774047ec31 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -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} $< | ${TOOL_SED} -e 's,^\#.*,,' | \
## (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 --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index d356a0dc555..4124c8d5d5b 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -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${KASANFLAGS}}
## (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 --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index 5fa4794f03f..ac6042f52a3 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -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
diff --git a/sys/arch/arm/conf/Makefile.arm b/sys/arch/arm/conf/Makefile.arm
index d910ce58427..ae735a325a4 100644
--- a/sys/arch/arm/conf/Makefile.arm
+++ b/sys/arch/arm/conf/Makefile.arm
@@ -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=xscale
##
## (3) libkern and compat
##
-KERN_AS= obj
-
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff --git a/sys/arch/atari/conf/Makefile.atari b/sys/arch/atari/conf/Makefile.atari
index d3d7349cc8e..f8e4c778df0 100644
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@@ -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
diff --git a/sys/arch/cesfic/conf/Makefile.cesfic b/sys/arch/cesfic/conf/Makefile.cesfic
index 173e521cc91..c9328860d8a 100644
--- a/sys/arch/cesfic/conf/Makefile.cesfic
+++ b/sys/arch/cesfic/conf/Makefile.cesfic
@@ -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,-m68030 -Wa,-m68851
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 17d607b7726..35e6b90ebd6 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -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
diff --git a/sys/arch/hpcarm/conf/Makefile.hpcarm b/sys/arch/hpcarm/conf/Makefile.hpcarm
index 14352d36c06..93f40929964 100644
--- a/sys/arch/hpcarm/conf/Makefile.hpcarm
+++ b/sys/arch/hpcarm/conf/Makefile.hpcarm
@@ -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
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 4930a946eca..f81759fa97b 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -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
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 2e732e35783..7bc1cedea39 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -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
diff --git a/sys/arch/ia64/conf/Makefile.ia64 b/sys/arch/ia64/conf/Makefile.ia64
index 62d23716d21..9465aac6563 100644
--- a/sys/arch/ia64/conf/Makefile.ia64
+++ b/sys/arch/ia64/conf/Makefile.ia64
@@ -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
diff --git a/sys/arch/luna68k/conf/Makefile.luna68k b/sys/arch/luna68k/conf/Makefile.luna68k
index e0dd2a494e0..71eb64ac192 100644
--- a/sys/arch/luna68k/conf/Makefile.luna68k
+++ b/sys/arch/luna68k/conf/Makefile.luna68k
@@ -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
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index ba71c880dae..8a748bc65d2 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -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
diff --git a/sys/arch/mips/conf/Makefile.mips b/sys/arch/mips/conf/Makefile.mips
index 6dce852eda7..0d89032c132 100644
--- a/sys/arch/mips/conf/Makefile.mips
+++ b/sys/arch/mips/conf/Makefile.mips
@@ -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-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
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 9a7fb297d1a..58959b5fd72 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -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
diff --git a/sys/arch/news68k/conf/Makefile.news68k b/sys/arch/news68k/conf/Makefile.news68k
index 3a80c94d898..71dc28519f9 100644
--- a/sys/arch/news68k/conf/Makefile.news68k
+++ b/sys/arch/news68k/conf/Makefile.news68k
@@ -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
diff --git a/sys/arch/next68k/conf/Makefile.next68k b/sys/arch/next68k/conf/Makefile.next68k
index ccc12df6936..728c143e6b8 100644
--- a/sys/arch/next68k/conf/Makefile.next68k
+++ b/sys/arch/next68k/conf/Makefile.next68k
@@ -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
diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc
index df4b7ad20f0..9aab32293d1 100644
--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ b/sys/arch/powerpc/conf/Makefile.powerpc
@@ -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
diff --git a/sys/arch/riscv/conf/Makefile.riscv b/sys/arch/riscv/conf/Makefile.riscv
index 32fdfca307e..97ff831f6d6 100644
--- a/sys/arch/riscv/conf/Makefile.riscv
+++ b/sys/arch/riscv/conf/Makefile.riscv
@@ -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
diff --git a/sys/arch/sh3/conf/Makefile.sh3 b/sys/arch/sh3/conf/Makefile.sh3
index 6f57c5eb1eb..45786427c41 100644
--- a/sys/arch/sh3/conf/Makefile.sh3
+++ b/sys/arch/sh3/conf/Makefile.sh3
@@ -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
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index f85a46a4496..79be259df3d 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -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-protector
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 8e309d602ca..82af16688ac 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -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
diff --git a/sys/arch/sun2/conf/Makefile.sun2 b/sys/arch/sun2/conf/Makefile.sun2
index bb5ae866346..3382715c0fd 100644
--- a/sys/arch/sun2/conf/Makefile.sun2
+++ b/sys/arch/sun2/conf/Makefile.sun2
@@ -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}
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 1d31ebb4941..560be625e48 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -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
diff --git a/sys/arch/usermode/conf/Makefile.usermode b/sys/arch/usermode/conf/Makefile.usermode
index 248616593a3..04166569d8a 100644
--- a/sys/arch/usermode/conf/Makefile.usermode
+++ b/sys/arch/usermode/conf/Makefile.usermode
@@ -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
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 502370034fc..6d175b204fe 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -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
diff --git a/sys/arch/x68k/conf/Makefile.x68k b/sys/arch/x68k/conf/Makefile.x68k
index 67ff2ad7bc7..0115fb24fd3 100644
--- a/sys/arch/x68k/conf/Makefile.x68k
+++ b/sys/arch/x68k/conf/Makefile.x68k
@@ -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
diff --git a/sys/arch/xen/conf/Makefile.xen b/sys/arch/xen/conf/Makefile.xen
index 06a5cbf27bc..3bebce90a84 100644
--- a/sys/arch/xen/conf/Makefile.xen
+++ b/sys/arch/xen/conf/Makefile.xen
@@ -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