system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

dtrace: Revert the addition of WITH_DTRACE_ASAN

Browse source 
The follow-up fix triggers a lib32 build failure, revert everything
until the problem is addressed.
This commit is contained in:
Mark Johnston 2023-08-01 13:01:37 -04:00
parent 391e1f23b3
commit 5cdaac92e1
7 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cddl/lib/libdtrace/Makefile
View file

@ -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

5
cddl/usr.sbin/dtrace/Makefile
View file

@ -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"

7
cddl/usr.sbin/lockstat/Makefile
View file

@ -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

7
cddl/usr.sbin/plockstat/Makefile
View file

@ -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>

5
share/man/man5/src.conf.5
View file

@ -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 .

1
share/mk/src.opts.mk
View file

@ -201,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_FORMAT \
DETECT_TZ_CHANGES \
DISK_IMAGE_TOOLS_BOOTSTRAP \
DTRACE_ASAN \
DTRACE_TESTS \
EXPERIMENTAL \
HESIOD \

4
tools/build/options/WITH_DTRACE_ASAN
View file

@ -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.