From nobody Thu Jan 12 15:06:48 2023 X-Original-To: dev-commits-src-all@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 4Nt7Dm6Yjzz2r5T4; Thu, 12 Jan 2023 15:06:48 +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 4Nt7Dm63y7z3Q0j; Thu, 12 Jan 2023 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536008; 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=fIdKpX/+UO0NjGAQmt8STkLcB9pweKusIKsAyPK2BsI=; b=pvRm19bKsRNlqeVTrd+aPhgwLy7pUG3YIFNa5FqDqyL6AgR5X/E9ySm9MqhZMWUENMz16r YQAUwrQA0mFn+bch7el+zalVhhaUV3NI8OqbQlr2o4KuksMwQhaIagBPbBUyQaFfacpES9 QCYGBS+M8QWuTRXqQAbvG6cfbu9bTzbf2Oo5+3oNJLzGnHns+y6H4UJXSHZnQ3lQ1fJ0gJ jnV79TWtbDgAi5eAEbi4A3yxYVjKcRkP3oka4eyEl3RpYbWM/3D4A3sWhnvao+95G84YQy MgEN0mB+/eKGcgmaDwGDTsZYSgkfT8yfEp2CvQ0NCDq27Jhbzg0aTBHW2Ujb2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536008; 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=fIdKpX/+UO0NjGAQmt8STkLcB9pweKusIKsAyPK2BsI=; b=Iyvu0aigAjaGX/DJWOGxaa/RE/f1ScBKSJl0Vn1s+W8ZS8egc3n+t5pkEF4anr8ja13u5e qrp8zQ+N7e8MKeLzqzTiQw8jGV1g1/qJ6LVXTYd8A08r41RAp9Vl6uYs0JByX1AlQVu1hV WEF1Q3FWi/DQ96cgpFHgpXFEq0hklmLGoT5xzB3ujFVBkSLJ+32ciLZaVFbFy7+BD3s1gk Cj6og3UUsobhazjzsoNlTK+gDcQbgYyPD1MC2v67KvH7jObKd0bABbhfwDxdLU0UStZ1sc ReVAsXF0Jnq7zGC+eGrqVllwM0x9OPhzoeIJYatksmWcqfq5/KNHbpBlEn3+Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673536008; a=rsa-sha256; cv=none; b=TDFG2pt8MR4PNjU8GRFzPderU/6zRDT61ODc4rb1/wGZoXvwEwaHgMuqDO153nkqJvv+Y6 rpaZdFdPUum+bZBaSQlmgZd9ACCibfCMCEfnFg6yhZbd5M+TFHhJNjrZGCmu2r+Jka2x0E 0fm+0OdZNLbRVMg+Tb7I/6WeLiwOSbypzVEecjtheEpybx46ugqCNPrk/+rtPJgEl1nwxW TwhNA7q9qCc3+2xAbf+8NuQqMkZMDLm1FvRhQw6m/QKk0bt52v3ajFlebtbk20p9dfKZBl w0Tl83BDutCgci9bFz2DZrORvwhxdc9HJT4mQKwvCxnykrDQ9FLez+Obd8SILA== 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 4Nt7Dm572YzXLh; Thu, 12 Jan 2023 15:06:48 +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 30CF6m9m036427; Thu, 12 Jan 2023 15:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CF6mB8036426; Thu, 12 Jan 2023 15:06:48 GMT (envelope-from git) Date: Thu, 12 Jan 2023 15:06:48 GMT Message-Id: <202301121506.30CF6mB8036426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8372afd096ea - main - Clarify DTR_ENABLED make variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8372afd096ea24d45a573fce11024d143058cdab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8372afd096ea24d45a573fce11024d143058cdab commit 8372afd096ea24d45a573fce11024d143058cdab Author: Mitchell Horne AuthorDate: 2023-01-03 17:54:15 +0000 Commit: Mitchell Horne 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