From nobody Mon Jan 23 16:45:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0wvG5v4Jz30w63; Mon, 23 Jan 2023 16:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0wvG5N80z3wsL; Mon, 23 Jan 2023 16:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zedXjXXyPNATya2JP/xRq5Nga7JZB3HnToaiGQ9SQ94=; b=p8gZbJMaMse3b/Nq4BZhFO7qtAQYRGdBchao2kVp/qAyFjS2HBCR93klzTlsZydny9lNVz xiyracK5Db89sJKDRb065Hk05PC+nsgUgWhbvxC36+gpAay/4OHt7dNxYfsUdib0hwSlRp uQeiST9vFP+lEaE5lbU+XszALNNPBP3m4FTwRCq2pLloFFrqfrbWgqxCfMfvUfbeY/I0Tv +06jykGpmZltlKTfdKKGyXbsrdhiyqcWq1Pk4d2GpEEXCMonx9i8k6RaqDF4IxipX7xYAZ 26LpwSVHFOICNNRrbNKlkdpkSDSOh4u7yPgje5xeUMDGi8k93ZChwiLndzt6Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zedXjXXyPNATya2JP/xRq5Nga7JZB3HnToaiGQ9SQ94=; b=rHqZZ4tvLDQPBB6nqImdCp3g0735Xs2Oq9yoEWhQwFH8SDJ0G5LySjSiWI44QqpjTOiyXr kHMWpmhEy/JCqB+m/5mVV9qTOWcLR9nC8CAkTdliMuvpDJNdeYmN7gQfv2ifVMk/dluXCw sSJknp0GsHJkZbHtL2DriaGjcLrPQ+gbpavhRVWpYx71R42LsGrHldc3H/Ncrlds8y6dgP NYNdb7dmWm13LqK6JSBTNiDjblw02Y/LYovDvTUZp2YrnvDZAU4I3ZaX8d2ereEeFYgpTX 15qZOp1WhcZL732qhSvODRWvCL9JIfYilCz6LQpCNW4HMkvr0iIfOn1yQNTH2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674492314; a=rsa-sha256; cv=none; b=cG3zVSx2diYSaLlnXzUJejj2/BS9jBQdQDO8djNrMufObIT5Dfs8ThUeXMIpOL6AfeJKO/ 7AENKHqO4dXVIV7X2RoZEI4rRXsTWrSsqgNjmfzlaxL3Z/UfchWqBt9hXAHUsNGFkoRm1W FyKwa85p/XuHDJBarGYGDlLikPzkZH2lPS4AByjyeTu404cZVFRW2NuhgSpoV/ZNU56IUZ xMHIJa8VAZNJOHCDJ6El8Cm3Y/VPCsk0GJUbawkvVqRAtqkUKKZfUn4oRJ5LtxYtzuehR3 +eNVhFZ82wQZFWB4cIq8eq/VNQjovCu//482IBsY0k0p8t0JALLCXujZjbhQcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0wvG4L6Szbv1; Mon, 23 Jan 2023 16:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NGjEnf044287; Mon, 23 Jan 2023 16:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NGjECK044286; Mon, 23 Jan 2023 16:45:14 GMT (envelope-from git) Date: Mon, 23 Jan 2023 16:45:14 GMT Message-Id: <202301231645.30NGjECK044286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 45da40c2c377 - stable/13 - Clarify DTR_ENABLED make variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 45da40c2c377ba4ab3efd03eed9cf242f01c9c68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=45da40c2c377ba4ab3efd03eed9cf242f01c9c68 commit 45da40c2c377ba4ab3efd03eed9cf242f01c9c68 Author: Mitchell Horne AuthorDate: 2023-01-03 17:54:15 +0000 Commit: Mitchell Horne CommitDate: 2023-01-23 16:38:53 +0000 Clarify DTR_ENABLED make variable Rename it to DTRACE_ENABLED. Suggested by: jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 8372afd096ea24d45a573fce11024d143058cdab) --- 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 645c27627124..6af49075cae8 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -386,5 +386,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