dtrace: Revert the addition of WITH_DTRACE_ASAN
The follow-up fix triggers a lib32 build failure, revert everything until the problem is addressed.
This commit is contained in:
parent
391e1f23b3
commit
5cdaac92e1
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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 .
|
||||
|
@ -201,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \
|
||||
CLANG_FORMAT \
|
||||
DETECT_TZ_CHANGES \
|
||||
DISK_IMAGE_TOOLS_BOOTSTRAP \
|
||||
DTRACE_ASAN \
|
||||
DTRACE_TESTS \
|
||||
EXPERIMENTAL \
|
||||
HESIOD \
|
||||
|
@ -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.
|
Loading…
Reference in New Issue
Block a user