summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2012-09-12 14:19:40 +0000
committerobrien <obrien@FreeBSD.org>2012-09-12 14:19:40 +0000
commit2b81e41ea80fc64dafcfe5d6e451547738ec938c (patch)
tree8b935d616cdba982357355bcbe5824604e3df98d
parentfea385a6bf8d4cbceec7359f5c9a45cc46db5f4a (diff)
downloadFreeBSD-src-2b81e41ea80fc64dafcfe5d6e451547738ec938c.zip
FreeBSD-src-2b81e41ea80fc64dafcfe5d6e451547738ec938c.tar.gz
Remove duplication and centralize testing of various config(8)ed features.
-rw-r--r--sys/conf/Makefile.amd643
-rw-r--r--sys/conf/Makefile.arm2
-rw-r--r--sys/conf/Makefile.powerpc1
-rw-r--r--sys/conf/kern.pre.mk5
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index faf01c6..0dce5ef 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -31,9 +31,6 @@ S= ../../..
.endif
.include "$S/conf/kern.pre.mk"
-DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
-DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
-HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true ; echo
.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED)
CFLAGS+= -fno-omit-frame-pointer
.endif
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 13997ea..6270aef 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -39,8 +39,6 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}
STRIP_FLAGS = -S
.endif
-DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
-
.if empty(DDB_ENABLED)
CFLAGS += -mno-apcs-frame
.endif
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index ebd820c..2abc4d4 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -37,7 +37,6 @@ INCLUDES+= -I$S/contrib/libfdt
CFLAGS+= -msoft-float -Wa,-many
-DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
.if !empty(DDB_ENABLED)
CFLAGS+= -fno-omit-frame-pointer
.endif
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 70df729..23cb975 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -189,3 +189,8 @@ MKMODULESENV+= WITHOUT_MODULES="${WITHOUT_MODULES}"
.if defined(DEBUG)
MKMODULESENV+= DEBUG_FLAGS="${DEBUG}"
.endif
+
+# Are various things configured?
+DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
+DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
+HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true ; echo
OpenPOWER on IntegriCloud