Author: obrien
Date: Wed Sep 12 14:19:40 2012
New Revision: 240402
URL: http://svn.freebsd.org/changeset/base/240402
Log:
Remove duplication and centralize testing of various config(8)ed features.
Modified:
head/sys/conf/Makefile.amd64
head/sys/conf/Makefile.arm
head/sys/conf/Makefile.powerpc
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/Makefile.amd64
==============================================================================
--- head/sys/conf/Makefile.amd64 Wed Sep 12 14:17:11 2012
(r240401)
+++ head/sys/conf/Makefile.amd64 Wed Sep 12 14:19:40 2012
(r240402)
@@ -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
Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm Wed Sep 12 14:17:11 2012 (r240401)
+++ head/sys/conf/Makefile.arm Wed Sep 12 14:19:40 2012 (r240402)
@@ -39,8 +39,6 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri
STRIP_FLAGS = -S
.endif
-DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
-
.if empty(DDB_ENABLED)
CFLAGS += -mno-apcs-frame
.endif
Modified: head/sys/conf/Makefile.powerpc
==============================================================================
--- head/sys/conf/Makefile.powerpc Wed Sep 12 14:17:11 2012
(r240401)
+++ head/sys/conf/Makefile.powerpc Wed Sep 12 14:19:40 2012
(r240402)
@@ -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
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Wed Sep 12 14:17:11 2012 (r240401)
+++ head/sys/conf/kern.pre.mk Wed Sep 12 14:19:40 2012 (r240402)
@@ -189,3 +189,8 @@ MKMODULESENV+= WITHOUT_MODULES="${WITHOU
.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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
