CVS commit: [netbsd-9] src/tests/lib/libc/misc

2019-08-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Aug 16 19:14:29 UTC 2019

Modified Files:
src/tests/lib/libc/misc [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by kamil in ticket #62):

tests/lib/libc/misc/Makefile: revision 1.4

Fix build of t_ubsan/t_ubsanxx under MKSANITIZER
Do not link micro-ubsan runtime for disabled tests.

This avoids double symbols linked into a single binary.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/lib/libc/misc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-9] src/tests/lib/libc/misc

2019-08-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Aug 16 19:14:29 UTC 2019

Modified Files:
src/tests/lib/libc/misc [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by kamil in ticket #62):

tests/lib/libc/misc/Makefile: revision 1.4

Fix build of t_ubsan/t_ubsanxx under MKSANITIZER
Do not link micro-ubsan runtime for disabled tests.

This avoids double symbols linked into a single binary.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/lib/libc/misc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/misc/Makefile
diff -u src/tests/lib/libc/misc/Makefile:1.3 src/tests/lib/libc/misc/Makefile:1.3.4.1
--- src/tests/lib/libc/misc/Makefile:1.3	Mon Feb  4 03:10:33 2019
+++ src/tests/lib/libc/misc/Makefile	Fri Aug 16 19:14:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/04 03:10:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2019/08/16 19:14:29 martin Exp $
 
 .include 
 
@@ -8,13 +8,15 @@ TESTS_C+=	t_ubsan
 TESTS_CXX+=	t_ubsanxx
 
 .PATH:		${NETBSDSRCDIR}/common/lib/libc/misc
-SRCS.t_ubsan=	t_ubsan.c ubsan.c
-SRCS.t_ubsanxx=	t_ubsanxx.cpp ubsan.c
+SRCS.t_ubsan=	t_ubsan.c
+SRCS.t_ubsanxx=	t_ubsanxx.cpp
 
 .if ${MKSANITIZER:Uno} != "yes" && ${MKLIBCSANITIZER:Uno} != "yes"
 # These tests are designed to be used against micro-UBSan only.
 # micro-UBSan is used in these tests as a standalone libary only.
 CPPFLAGS+=		-DENABLE_TESTS
+SRCS.t_ubsan+=		ubsan.c
+SRCS.t_ubsanxx+=	ubsan.c
 UBSAN_FLAGS=		-fsanitize=undefined
 UBSAN_FLAGS+=		${${ACTIVE_CC} == "clang" :? -fsanitize=integer :}
 UBSAN_FLAGS+=		${${ACTIVE_CC} == "clang" :? -fsanitize=nullability :}