git: 5cdaac92e119 - main - dtrace: Revert the addition of WITH_DTRACE_ASAN

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=5cdaac92e119d41063d4f0155a78a4abe767f15e

commit 5cdaac92e119d41063d4f0155a78a4abe767f15e
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-08-01 17:01:37 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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 <src.opts.mk>
-
 .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 <src.opts.mk>
-
 .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 <src.opts.mk>
-
 .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 <bsd.prog.mk>
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.