git: 8372afd096ea - main - Clarify DTR_ENABLED make variable
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Jan 2023 15:06:48 UTC
The branch main has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=8372afd096ea24d45a573fce11024d143058cdab
commit 8372afd096ea24d45a573fce11024d143058cdab
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-01-03 17:54:15 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-01-12 15:03:49 +0000
Clarify DTR_ENABLED make variable
Rename it to DTRACE_ENABLED.
Suggested by: jhb
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
---
sys/conf/Makefile.amd64 | 2 +-
sys/conf/Makefile.arm64 | 2 +-
sys/conf/kern.pre.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 6effea176878..5438144e6ccc 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -33,7 +33,7 @@ S= ../../..
INCLUDES+= -I$S/contrib/libfdt
-.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED)
+.if !empty(DDB_ENABLED) || !empty(DTRACE_ENABLED) || !empty(HWPMC_ENABLED)
CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
.endif
diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64
index e8a534dadf5c..cda063466116 100644
--- a/sys/conf/Makefile.arm64
+++ b/sys/conf/Makefile.arm64
@@ -62,7 +62,7 @@ SYSTEM_LD= \
KERNEL_EXTRA+= ${KERNEL_KO}.bin
KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin
-.if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED)
+.if !empty(DDB_ENABLED) || !empty(DTRACE_ENABLED) || !empty(HWPMC_ENABLED)
CFLAGS += -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
.endif
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index d1c1f9d09dbc..49437ac6c2da 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -367,5 +367,5 @@ MKMODULESENV+= __MPATH="${__MPATH}"
# Detect kernel config options that force stack frames to be turned on.
DDB_ENABLED!= grep DDB opt_ddb.h || true ; echo
-DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
+DTRACE_ENABLED!=grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true ; echo