[src/netbsd-9]: src/tests/lib/libc/misc Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f5ed8f98bc3f
branches:  netbsd-9
changeset: 962811:f5ed8f98bc3f
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 16 19:14:29 2019 +0000

description:
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.

diffstat:

 tests/lib/libc/misc/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c4ce6a565717 -r f5ed8f98bc3f tests/lib/libc/misc/Makefile
--- a/tests/lib/libc/misc/Makefile      Fri Aug 16 19:12:46 2019 +0000
+++ b/tests/lib/libc/misc/Makefile      Fri Aug 16 19:14:29 2019 +0000
@@ -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 <bsd.own.mk>
 
@@ -8,13 +8,15 @@
 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 :}