From nobody Tue Aug 1 17:03:31 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 4RFhJh5XlQz4pdGJ; Tue, 1 Aug 2023 17:03:32 +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 4RFhJg6bZ2z4KKL; Tue, 1 Aug 2023 17:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690909412; 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=cAK19CWoUeVdeMa0GcF9qiuzV+XLCMNmcaE5dbmN/VI=; b=I2yLymxL8MMM4AId3AgI7BMOCGU0XRZFGPjFKp8LJv8e3pu6OdmV9R45rIcewWBDIK+Sii 0/IoVpKb/76HwxpiXbh6cJygDtzbBIa5YP+VXM9pglhLj4hEToXlCrFUPeKt0u0lRu8WBv SrJsks6gdKIgJI0XEWyYwNZmUn5NKKCXuusMfuK4qAlahyLT4xKrNGfk8vw8o4UNKV0MIz 4EoYYLEkuGzps0tPevXr7/oxdm7wYx1sCmrLZ2agGreLdssy89nsFaZ+a6jt6EnyDX8Kf6 TdkiBRF9vdA0xiFthIyu6qzc2zaIIVbf1zgnfCeSGUdKFLCTzhIHQL6o0Si6RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690909412; a=rsa-sha256; cv=none; b=XUw1V1Z7z8S8Z7avcAS0Y1QGHMhVOEy2fLmjUHKVVAAneN9ZSLWc6WR1cwBmh4hx3w4oI7 W0bbu/V+JjRZio9nFzFPIYJ2U3iqmhcY9SDWT1pWlYRRFoCRdPYJeSbAr18tAPlpPkZSIm SgcfHFj7FNLUVslMDMpR9SfHB3Fhz6h48qyLZiENjrHG7kl0wioC+3yftXaakG5nF5IvpM 2ptikTbrcO/Couf4wNhRXADGQ9LJtsA53Ozdi4F26y+E4lz2Y3h5GdQrce6tdk2bDfKtac eY/SNnqhKP2B5L4PZ8o/iRMgYKA1pVNGAQOkcOFqG3yVUJ4v/iMAQ7NkJ+2HCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690909412; 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=cAK19CWoUeVdeMa0GcF9qiuzV+XLCMNmcaE5dbmN/VI=; b=U2YasmwKZL9BuN7tJyOeZN4JBW3ANqQNPPRwTlcR9jWpeZ2l34TQ/pf/AdFFSlhdkUvONh f6AutqNxE60DKL8xb0ZQ1d9Rk0NZefavVdeawtcovr6E4cIJ2/2C8aDmeycA9cOU+Be/iR MG05aIvfZmBYJ77fEbnVJObBCAZH9Hkdw82tBktxyPrBVVv+WJX6L6hgBdcTSTmZvfUx55 NgdWD4RUUBWdvQ60pV3/rin8E7Sk/k668rH35hOaJoFwvcULSlUCpGY0LY6af6w8aEKfGo uxX4nWN/PD7jrCGJcuBJ3JldHTnb+5Yko2yL51He3K/+4sdofWruQ1ZJqABaIA== 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 4RFhJg3ZxGzlZB; Tue, 1 Aug 2023 17:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371H3VVQ012824; Tue, 1 Aug 2023 17:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371H3V7a012823; Tue, 1 Aug 2023 17:03:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:03:31 GMT Message-Id: <202308011703.371H3V7a012823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5cdaac92e119 - main - dtrace: Revert the addition of WITH_DTRACE_ASAN 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cdaac92e119d41063d4f0155a78a4abe767f15e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaac92e119d41063d4f0155a78a4abe767f15e commit 5cdaac92e119d41063d4f0155a78a4abe767f15e Author: Mark Johnston AuthorDate: 2023-08-01 17:01:37 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 17:03:10 +0000 dtrace: Revert the addition of WITH_DTRACE_ASAN The follow-up fix triggers a lib32 build failure, revert everything until the problem is addressed. --- cddl/lib/libdtrace/Makefile | 11 ----------- cddl/usr.sbin/dtrace/Makefile | 5 ----- cddl/usr.sbin/lockstat/Makefile | 7 ------- cddl/usr.sbin/plockstat/Makefile | 7 ------- share/man/man5/src.conf.5 | 5 ----- share/mk/src.opts.mk | 1 - tools/build/options/WITH_DTRACE_ASAN | 4 ---- 7 files changed, 40 deletions(-) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index d6771aee37b6..23cc8d2db574 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,16 +1,10 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common PACKAGE= dtrace LIB= dtrace - -SHLIBDIR= /lib -SHLIB_MAJOR= 2 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -144,11 +138,6 @@ DSRCS+= regs_aarch64.d YFLAGS+=-d -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= ctf elf proc pthread rtld_db CLEANFILES= dt_errtags.c dt_names.c diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index fcc0668f1b1d..d8510e62fb29 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -30,11 +30,6 @@ CFLAGS+= -DHAVE_ISSETUGID #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= dtrace ctf elf proc spl .if ${MK_DTRACE_TESTS} != "no" diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index 72cedbdb20ed..a4bec42df367 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat PACKAGE= dtrace @@ -28,11 +26,6 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index 41ef446c111b..22610870c846 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat PACKAGE= dtrace @@ -28,11 +26,6 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ -I${SRCTOP}/sys CFLAGS+= -DHAVE_ISSETUGID -.if ${MK_DTRACE_ASAN} != "no" -CFLAGS+= -fsanitize=address -fsanitize=undefined -LDFLAGS+= -fsanitize=address -fsanitize=undefined -.endif - LIBADD= dtrace proc .include diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 7eb920e70c5c..4554735207c8 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -594,11 +594,6 @@ When set, it enforces these options: .It .Va WITHOUT_CTF .El -.It Va WITH_DTRACE_ASAN -Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) -with address and undefined behavior sanitizers. -Requires that Clang be used as the base system compiler -and that the runtime support library is available. .It Va WITH_DTRACE_TESTS Build and install the DTrace test suite in .Pa /usr/tests/cddl/usr.sbin/dtrace . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index a799c1614fff..899d620fb0c1 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -201,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \ CLANG_FORMAT \ DETECT_TZ_CHANGES \ DISK_IMAGE_TOOLS_BOOTSTRAP \ - DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ diff --git a/tools/build/options/WITH_DTRACE_ASAN b/tools/build/options/WITH_DTRACE_ASAN deleted file mode 100644 index 4240aee4b89b..000000000000 --- a/tools/build/options/WITH_DTRACE_ASAN +++ /dev/null @@ -1,4 +0,0 @@ -Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1)) -with address and undefined behavior sanitizers. -Requires that Clang be used as the base system compiler -and that the runtime support library is available.