Module Name: src
Committed By: martin
Date: Wed Jul 7 11:51:46 UTC 2021
Modified Files:
src/sys/rump: Makefile.rump
src/tests: Makefile.inc
src/tests/rump/modautoload: Makefile
src/usr.bin/rump_allserver: Makefile
src/usr.bin/rump_dhcpclient: Makefile
src/usr.bin/rump_halt: Makefile
src/usr.bin/rump_server: Makefile
src/usr.sbin/npf/npftest: Makefile
src/usr.sbin/puffs: Makefile.inc
Log Message:
Allow to set sanitizer flags for the rump build from the
build.sh command line, like: -V RUMP_SANITIZE=address
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.9 -r1.10 src/tests/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/tests/rump/modautoload/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/rump_allserver/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_dhcpclient/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_halt/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/rump_server/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/npf/npftest/Makefile
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/puffs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.132 src/sys/rump/Makefile.rump:1.133
--- src/sys/rump/Makefile.rump:1.132 Sun Apr 25 15:16:56 2021
+++ src/sys/rump/Makefile.rump Wed Jul 7 11:51:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.132 2021/04/25 15:16:56 christos Exp $
+# $NetBSD: Makefile.rump,v 1.133 2021/07/07 11:51:45 martin Exp $
#
.if !defined(_RUMP_MK)
@@ -24,6 +24,11 @@ CPPFLAGS+= -D_RUMPKERNEL -I${RUMPTOP}/li
# aborts after kern_assert on NULL pointer checks.
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
+.if ${RUMP_SANITIZE:Uno} != "no"
+CFLAGS+= -fsanitize=${RUMP_SANITIZE}
+LDFLAGS+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
# NULL + 0 arithmetic raises LLVM UBSan warnings, specially in sys/pslist.h
# in the type-safe macros _PSLIST_VALIDATE_PTRS and _PSLIST_VALIDATE_CONTAINER.
.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
Index: src/tests/Makefile.inc
diff -u src/tests/Makefile.inc:1.9 src/tests/Makefile.inc:1.10
--- src/tests/Makefile.inc:1.9 Sun May 17 18:52:43 2020
+++ src/tests/Makefile.inc Wed Jul 7 11:51:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2020/05/17 18:52:43 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2021/07/07 11:51:45 martin Exp $
WARNS ?= 4
CWARNFLAGS+= -Wno-missing-noreturn
TOOLSSRCDIR:= ${.PARSEDIR}
@@ -9,3 +9,6 @@ LIBRUMPFIFO_PRE = -lrumpvfs_fifofs -lrum
LIBRUMPFIFO = -lrumpvfs_nofifofs
LIBRUMPBASE = ${LIBRUMPFIFO_PRE} -lrumpvfs -lrump -lrumpvfs -lrumpvfs_nofifofs -lrumpuser -lrump -lpthread
+.if ${RUMP_SANITIZE:Uno} != "no"
+LIBRUMPBASE+= -fsanitize=${RUMP_SANITIZE}
+.endif
Index: src/tests/rump/modautoload/Makefile
diff -u src/tests/rump/modautoload/Makefile:1.12 src/tests/rump/modautoload/Makefile:1.13
--- src/tests/rump/modautoload/Makefile:1.12 Tue May 26 18:52:29 2020
+++ src/tests/rump/modautoload/Makefile Wed Jul 7 11:51:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/26 18:52:29 christos Exp $
+# $NetBSD: Makefile,v 1.13 2021/07/07 11:51:45 martin Exp $
#
.include <bsd.init.mk>
@@ -25,6 +25,10 @@ LDADD+= \
LDADD+= -lrumpuser -lpthread
DPADD+= ${LIBRUMPVFS} ${LIBRUMP} ${LIBRUMPUSER}
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
WARNS= 4
# To include a rump version of sysctlbyname()
Index: src/usr.bin/rump_allserver/Makefile
diff -u src/usr.bin/rump_allserver/Makefile:1.13 src/usr.bin/rump_allserver/Makefile:1.14
--- src/usr.bin/rump_allserver/Makefile:1.13 Sun May 17 19:37:15 2020
+++ src/usr.bin/rump_allserver/Makefile Wed Jul 7 11:51:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/17 19:37:15 christos Exp $
+# $NetBSD: Makefile,v 1.14 2021/07/07 11:51:45 martin Exp $
#
PROG= rump_allserver
@@ -14,4 +14,8 @@ RUMPTOP=${.CURDIR}/../../sys/rump
LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
LDADD+= -lrumpdev -lrumpnet -lrumpvfs -lrump -lrumpvfs -lrumpvfs_nofifofs -lrump -lrumpuser -lpthread
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
.include <bsd.prog.mk>
Index: src/usr.bin/rump_dhcpclient/Makefile
diff -u src/usr.bin/rump_dhcpclient/Makefile:1.3 src/usr.bin/rump_dhcpclient/Makefile:1.4
--- src/usr.bin/rump_dhcpclient/Makefile:1.3 Thu May 11 13:20:02 2017
+++ src/usr.bin/rump_dhcpclient/Makefile Wed Jul 7 11:51:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/11 13:20:02 sevan Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/07 11:51:46 martin Exp $
#
PROG= rump.dhcpclient
@@ -6,4 +6,8 @@ SRCS= main.c bpf.c common.c configure.c
LDADD+= -lrumpclient
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
.include <bsd.prog.mk>
Index: src/usr.bin/rump_halt/Makefile
diff -u src/usr.bin/rump_halt/Makefile:1.3 src/usr.bin/rump_halt/Makefile:1.4
--- src/usr.bin/rump_halt/Makefile:1.3 Thu May 11 13:20:02 2017
+++ src/usr.bin/rump_halt/Makefile Wed Jul 7 11:51:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/11 13:20:02 sevan Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/07 11:51:46 martin Exp $
#
PROG= rump.halt
@@ -6,4 +6,8 @@ PROG= rump.halt
LDADD+= -lrumpclient
DPADD+= ${RUMPCLIENT}
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
.include <bsd.prog.mk>
Index: src/usr.bin/rump_server/Makefile
diff -u src/usr.bin/rump_server/Makefile:1.14 src/usr.bin/rump_server/Makefile:1.15
--- src/usr.bin/rump_server/Makefile:1.14 Sat May 16 12:46:57 2020
+++ src/usr.bin/rump_server/Makefile Wed Jul 7 11:51:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/16 12:46:57 christos Exp $
+# $NetBSD: Makefile,v 1.15 2021/07/07 11:51:46 martin Exp $
#
.PATH: ${.CURDIR}/../rump_allserver
@@ -13,4 +13,8 @@ LDADD+= \
-Wl,--no-whole-archive
LDADD+= -lpthread
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
.include <bsd.prog.mk>
Index: src/usr.sbin/npf/npftest/Makefile
diff -u src/usr.sbin/npf/npftest/Makefile:1.13 src/usr.sbin/npf/npftest/Makefile:1.14
--- src/usr.sbin/npf/npftest/Makefile:1.13 Sat May 16 12:42:11 2020
+++ src/usr.sbin/npf/npftest/Makefile Wed Jul 7 11:51:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/16 12:42:11 christos Exp $
+# $NetBSD: Makefile,v 1.14 2021/07/07 11:51:46 martin Exp $
#
# Public Domain
#
@@ -20,6 +20,10 @@ LDADD+= -L${LIBNPFTEST} -lnpftest
LDADD+= -lrump -lrumpvfs_nofifofs -lrumpvfs -lrumpuser
LDADD+= -lrumpnet -lrumpnet_net -lrumpdev_bpf
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
.include <bsd.own.mk>
.if ${MKSLJIT} != "no"
Index: src/usr.sbin/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.17 src/usr.sbin/puffs/Makefile.inc:1.18
--- src/usr.sbin/puffs/Makefile.inc:1.17 Sun May 17 18:59:02 2020
+++ src/usr.sbin/puffs/Makefile.inc Wed Jul 7 11:51:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2020/05/17 18:59:02 christos Exp $
+# $NetBSD: Makefile.inc,v 1.18 2021/07/07 11:51:46 martin Exp $
WARNS?= 4
@@ -46,6 +46,10 @@ LDADD+= -lrumpdev_disk -lrumpdev
LDADD+= -lp2k -lukfs -lrumpvfs -lrumpvfs_nofifofs -lrump -lrumpuser -lpuffs -lutil
LDADD+= -lpthread
+.if ${RUMP_SANITIZE:Uno} != "no"
+LDADD+= -fsanitize=${RUMP_SANITIZE}
+.endif
+
DPADD+= ${LIBP2K} ${LIBUKFS} ${LIBRUMPVFS} ${LIBRUMP} ${LIBRUMPUSER}
DPADD+= ${LIBPUFFS} ${LIBUTIL} ${LIBPTHREAD}
.endif # ISRUMP
