Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys - Determine KERN_AS automatically depending on whether O...
details: https://anonhg.NetBSD.org/src/rev/f9aac7aef408
branches: trunk
changeset: 836016:f9aac7aef408
user: rin <rin%NetBSD.org@localhost>
date: Sat Sep 22 12:24:01 2018 +0000
description:
- 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:
sys/arch/aarch64/conf/Makefile.aarch64 | 4 ++--
sys/arch/acorn32/conf/Makefile.acorn32 | 4 ++--
sys/arch/alpha/conf/Makefile.alpha | 7 +------
sys/arch/amd64/conf/Makefile.amd64 | 7 +------
sys/arch/amiga/conf/Makefile.amiga | 4 ++--
sys/arch/arm/conf/Makefile.arm | 5 ++---
sys/arch/atari/conf/Makefile.atari | 4 ++--
sys/arch/cesfic/conf/Makefile.cesfic | 4 ++--
sys/arch/hp300/conf/Makefile.hp300 | 4 ++--
sys/arch/hpcarm/conf/Makefile.hpcarm | 4 ++--
sys/arch/hppa/conf/Makefile.hppa | 4 ++--
sys/arch/i386/conf/Makefile.i386 | 7 +------
sys/arch/ia64/conf/Makefile.ia64 | 4 ++--
sys/arch/luna68k/conf/Makefile.luna68k | 7 +------
sys/arch/mac68k/conf/Makefile.mac68k | 4 ++--
sys/arch/mips/conf/Makefile.mips | 7 +------
sys/arch/mvme68k/conf/Makefile.mvme68k | 4 ++--
sys/arch/news68k/conf/Makefile.news68k | 4 ++--
sys/arch/next68k/conf/Makefile.next68k | 4 ++--
sys/arch/powerpc/conf/Makefile.powerpc | 7 +------
sys/arch/riscv/conf/Makefile.riscv | 7 +------
sys/arch/sh3/conf/Makefile.sh3 | 7 +------
sys/arch/sparc/conf/Makefile.sparc | 4 ++--
sys/arch/sparc64/conf/Makefile.sparc64 | 7 +------
sys/arch/sun2/conf/Makefile.sun2 | 7 +------
sys/arch/sun3/conf/Makefile.sun3 | 7 +------
sys/arch/usermode/conf/Makefile.usermode | 5 ++---
sys/arch/vax/conf/Makefile.vax | 4 ++--
sys/arch/x68k/conf/Makefile.x68k | 4 ++--
sys/arch/xen/conf/Makefile.xen | 4 ++--
sys/conf/Makefile.kern.inc | 6 +++---
sys/lib/libkern/Makefile.inc | 9 +++++++--
32 files changed, 59 insertions(+), 111 deletions(-)
diffs (truncated from 626 to 300 lines):
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/acorn32/conf/Makefile.acorn32
--- a/sys/arch/acorn32/conf/Makefile.acorn32 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/acorn32/conf/Makefile.acorn32 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/alpha/conf/Makefile.alpha
--- a/sys/arch/alpha/conf/Makefile.alpha Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/alpha/conf/Makefile.alpha Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
## (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 ae9c719d1963 -r f9aac7aef408 sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
## (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 ae9c719d1963 -r f9aac7aef408 sys/arch/amiga/conf/Makefile.amiga
--- a/sys/arch/amiga/conf/Makefile.amiga Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/amiga/conf/Makefile.amiga Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/arm/conf/Makefile.arm
--- a/sys/arch/arm/conf/Makefile.arm Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/arm/conf/Makefile.arm Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
-
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/atari/conf/Makefile.atari
--- a/sys/arch/atari/conf/Makefile.atari Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/atari/conf/Makefile.atari Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/cesfic/conf/Makefile.cesfic
--- a/sys/arch/cesfic/conf/Makefile.cesfic Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/cesfic/conf/Makefile.cesfic Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/hpcarm/conf/Makefile.hpcarm
--- a/sys/arch/hpcarm/conf/Makefile.hpcarm Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/hpcarm/conf/Makefile.hpcarm Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/hppa/conf/Makefile.hppa
--- a/sys/arch/hppa/conf/Makefile.hppa Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/hppa/conf/Makefile.hppa Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/i386/conf/Makefile.i386 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
## (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 ae9c719d1963 -r f9aac7aef408 sys/arch/ia64/conf/Makefile.ia64
--- a/sys/arch/ia64/conf/Makefile.ia64 Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/ia64/conf/Makefile.ia64 Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
## (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 ae9c719d1963 -r f9aac7aef408 sys/arch/mac68k/conf/Makefile.mac68k
--- a/sys/arch/mac68k/conf/Makefile.mac68k Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/mac68k/conf/Makefile.mac68k Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
##
## (3) libkern and compat
##
-KERN_AS= obj
+OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
diff -r ae9c719d1963 -r f9aac7aef408 sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips Sat Sep 22 12:19:11 2018 +0000
+++ b/sys/arch/mips/conf/Makefile.mips Sat Sep 22 12:24:01 2018 +0000
@@ -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 @@
## (3) libkern and compat
##
OPT_MODULAR= %MODULAR%
-.if !empty(OPT_MODULAR)
-KERN_AS= obj
-.else
-KERN_AS= library
Home |
Main Index |
Thread Index |
Old Index