Module Name: src
Committed By: mrg
Date: Fri Feb 8 22:06:12 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
define CAN_SANITIZE_UB properly: libasan and libtsan need to not
have it set, libubsan needs to have it set.
fixes almost all the new atf failures from GCC 7 switch.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.27 src/external/gpl3/gcc/lib/libasan/Makefile:1.28
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.27 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libasan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2019/02/08 22:06:12 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
NOSANITIZER= # defined
@@ -42,6 +42,7 @@ ASAN_SRCS= \
LIB= asan
SRCS+= ${ASAN_SRCS} lsan_common.cc lsan_common_linux.cc
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+CPPFLAGS+=-DCAN_SANITIZE_UB=0
.if ${MACHINE_ARCH} == "vax"
COPTS.asan_allocator.cc += -O1
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.8 src/external/gpl3/gcc/lib/libtsan/Makefile:1.9
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.8 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/02/08 22:06:12 mrg Exp $
.include <bsd.own.mk>
@@ -51,5 +51,6 @@ TSAN_SRCS+= tsan_rtl_unimpl.cc
LIB= tsan
SRCS+= ${TSAN_SRCS}
+CPPFLAGS+=-DCAN_SANITIZE_UB=0
.include <bsd.lib.mk>
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.10 src/external/gpl3/gcc/lib/libubsan/Makefile:1.11
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.10 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/08 22:06:12 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -31,5 +31,6 @@ COPTS.ubsan_handlers_cxx.cc+= -Wno-error
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+CPPFLAGS+=-DCAN_SANITIZE_UB=1
.include <bsd.lib.mk>
