From nobody Thu Jan 12 15:06:50 2023 X-Original-To: dev-commits-src-main@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 4Nt7Dq1Qs9z2r5Qg; Thu, 12 Jan 2023 15:06:51 +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 4Nt7Dq0lNtz3QBC; Thu, 12 Jan 2023 15:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536011; 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=mFgfMXc1hIUU4cwf7YDlEmz974u9ev7eWXxP7q2evu8=; b=XTqfNhAHvcWomd2dju7WqLyLr0ZqZuaJ8KeZSNhFAIS58rA5vKGIk8x7UaHVet2FeBi2qO Z0dr+woeV0yFExUCCRR/zsCkY2nJmMUtqo14+vgcB/rV5v9wcv79WY2BgsOPlQ2ZAh+x9b dtTR2jO2RtQXN2e54tFAWXJ1A2iGelYzf3yTmMf8ZjcBnT21V+nz8qEPhALa+lQ3JRPVNg 2Cen8QxpV0FYg9sdsNIIeEuK9BdaMWMAnkW1YZn0hfmnX1jd2aOKFkzi31whapqZ1m0XJY JQj/+Xle0vp9JKBYbNiRB48hhDoOfiTiKRK3nMp/3UriU12AxCgDRI7EumvkUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536011; 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=mFgfMXc1hIUU4cwf7YDlEmz974u9ev7eWXxP7q2evu8=; b=S83LANK5MmozQQ0YmOBZSLiVkuBR4MyK25UMrP+S4njCcbJvnslqMr4yOpadLa0+h/yNYg aDblEz0ys4QUsK86qyEDe0s8YXn1rmmMHn47WPGi3aFhcQo6RxM9LpBXGtHCkJA8O8UrIR VzJi9fwl0Zqm/OBKYbPLyVKwM/wo8lsGWiItkaI8nBCXOAtXEQqqC9+J0R5C33h7zOeYnc Yp1L7CUYX4LPojyL0UGzIBGhEUA8ROJG7SUVtXOVnbL2t6qmyqirGzWK42OW3XAeIznATQ 63SNovJiExPscfZ8vVIBXhbiUiziyAhx2ecyWB+iGw506KC8vuhaK6IdmLSHAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673536011; a=rsa-sha256; cv=none; b=BxcSfOlzM6aSBzR4iusNdKAcN1DIFtrxebaiX1+nfN+a1VIqQYv0BtVX377jQKNya82TDT Z7+j4ldWzbUG9MbktkisKCyYPKP6TZvXu97T0X77kDhJJHMhHwu5HrlF7XC1MAHA1XG5BI IizPIfBqD101jdAtGhim7lUew4bJ2vZnRSihalKDDFCYG0wjZyZGOKJK5Cc0F/AzWJcaoC PXZ+7bO1a3Fcg4GUe63kSiqggos6Ep8Q9vwLc1yUqbex2jke3WeYsMiD969EKNTN2sljcp ZGKI3X7lp7nn6TNYbJG6XT+4VLDrJdjGYn1X9TtIReFwCuO3XEUgjE3Q/OHeNQ== 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 4Nt7Dp6z7jzXPn; Thu, 12 Jan 2023 15:06:50 +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 30CF6opZ036481; Thu, 12 Jan 2023 15:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CF6onv036480; Thu, 12 Jan 2023 15:06:50 GMT (envelope-from git) Date: Thu, 12 Jan 2023 15:06:50 GMT Message-Id: <202301121506.30CF6onv036480@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: 10eed6bc2bc8 - main - dtrace: include fbt module unconditionally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 10eed6bc2bc84a646241a05def3f2542af5df79e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=10eed6bc2bc84a646241a05def3f2542af5df79e commit 10eed6bc2bc84a646241a05def3f2542af5df79e Author: Mitchell Horne AuthorDate: 2023-01-11 18:05:18 +0000 Commit: Mitchell Horne CommitDate: 2023-01-12 15:04:36 +0000 dtrace: include fbt module unconditionally It is supported on all platforms. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37658 --- sys/modules/dtrace/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 0bdb66c9c751..31beadb4d890 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -8,30 +8,26 @@ SUBDIR= dtaudit \ dtrace \ dtraceall \ dtrace_test \ + fbt \ profile \ prototype \ sdt \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -SUBDIR+= fasttrap fbt systrace_linux +SUBDIR+= fasttrap systrace_linux .endif .if ${MACHINE_CPUARCH} == "amd64" SUBDIR+= systrace_linux32 SUBDIR+= kinst .endif .if ${MACHINE_CPUARCH} == "powerpc" -SUBDIR+= fasttrap fbt +SUBDIR+= fasttrap .endif .if ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_ARCH} == "powerpc64" SUBDIR+= systrace_freebsd32 .endif -.if ${MACHINE_CPUARCH} == "aarch64" || \ - ${MACHINE_CPUARCH} == "arm" || \ - ${MACHINE_CPUARCH} == "riscv" -SUBDIR+= fbt -.endif .include