diff options
| -rw-r--r-- | sys/conf/Makefile.amd64 | 3 | ||||
| -rw-r--r-- | sys/conf/Makefile.arm | 2 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 1 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64 index faf01c6fc27e..0dce5ef8bb22 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 13997eaac625..6270aef1deac 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 ebd820c371fc..2abc4d408e86 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 70df729ae7cf..23cb9755394a 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 |