Module Name:    src
Committed By:   christos
Date:           Sun Jul  1 17:41:50 UTC 2018

Modified Files:
        src/external/gpl3/gcc/lib: Makefile.sanitizer
        src/external/gpl3/gcc/lib/libasan: Makefile
        src/external/gpl3/gcc/lib/liblsan: Makefile
        src/external/gpl3/gcc/lib/libubsan: Makefile

Log Message:
vaxinate the sanitizer build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/Makefile.sanitizer
cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/liblsan/Makefile
cvs rdiff -u -r1.7 -r1.8 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/Makefile.sanitizer
diff -u src/external/gpl3/gcc/lib/Makefile.sanitizer:1.5 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.6
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.5	Sat Jun  9 18:40:00 2018
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer	Sun Jul  1 13:41:49 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sanitizer,v 1.5 2018/06/09 22:40:00 christos Exp $
+#	$NetBSD: Makefile.sanitizer,v 1.6 2018/07/01 17:41:49 christos Exp $
 
 SANITIZER=${GCCDIST}/libsanitizer
 .PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -79,13 +79,18 @@ COPTS+=-fno-builtin -fno-exceptions -fno
 
 .if ${MACHINE_ARCH} == "vax"
 COPTS.sanitizer_allocator.cc += -O1
+COPTS.sanitizer_common.cc += -O1
+COPTS.sanitizer_common_libcdep.cc += -O1
 COPTS.sanitizer_coverage_libcdep.cc += -O1
 COPTS.sanitizer_coverage_mapping_libcdep.cc += -O1
 COPTS.sanitizer_deadlock_detector1.cc += -O1
 COPTS.sanitizer_mac.cc += -O1
 COPTS.sanitizer_netbsd.cc += -O1
+COPTS.sanitizer_posix.cc += -O1
 COPTS.sanitizer_printf.cc += -O1
 COPTS.sanitizer_procmaps_common.cc += -O1
 COPTS.sanitizer_stackdepot.cc += -O1
 COPTS.sanitizer_symbolizer_libcdep.cc += -O1
+COPTS.ubsan_diag.cc += -O1
+COPTS.ubsan_init.cc += -O1
 .endif

Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.25 src/external/gpl3/gcc/lib/libasan/Makefile:1.26
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.25	Thu Jun 28 06:15:01 2018
+++ src/external/gpl3/gcc/lib/libasan/Makefile	Sun Jul  1 13:41:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/06/28 10:15:01 christos Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/01 17:41:49 christos Exp $
 
 UNSUPPORTED_COMPILER.clang=	# defined
 NOSANITIZER=	# defined
@@ -43,9 +43,6 @@ LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
 .if ${MACHINE_ARCH} == "vax"
 COPTS.asan_allocator.cc += -O1
 COPTS.asan_report.cc += -O1
-COPTS.sanitizer_common.cc += -O1
-COPTS.sanitizer_common_libcdep.cc += -O1
-COPTS.sanitizer_posix.cc += -O1
 COPTS.ubsan_diag.cc += -O1
 COPTS.ubsan_init.cc += -O1
 .endif

Index: src/external/gpl3/gcc/lib/liblsan/Makefile
diff -u src/external/gpl3/gcc/lib/liblsan/Makefile:1.2 src/external/gpl3/gcc/lib/liblsan/Makefile:1.3
--- src/external/gpl3/gcc/lib/liblsan/Makefile:1.2	Tue Jun 26 17:06:45 2018
+++ src/external/gpl3/gcc/lib/liblsan/Makefile	Sun Jul  1 13:41:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/26 21:06:45 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/01 17:41:50 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,9 @@ lsan_interceptors.cc \
 lsan_preinit.cc \
 lsan_thread.cc
 
+.if ${MACHINE_ARCH} == "vax"
+COPTS.lsan_allocator.cc += -O1
+.endif
 
 LIB=	lsan
 SRCS+=	${LSAN_SRCS}

Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.7 src/external/gpl3/gcc/lib/libubsan/Makefile:1.8
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.7	Mon Jun 11 11:29:33 2018
+++ src/external/gpl3/gcc/lib/libubsan/Makefile	Sun Jul  1 13:41:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2018/06/11 15:29:33 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2018/07/01 17:41:50 christos Exp $
 
 UNSUPPORTED_COMPILER.clang=	# defined
 LIBISCXX = yes
@@ -31,8 +31,4 @@ LIB=	ubsan
 SRCS+=	${UBSAN_SRCS}
 LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
 
-.if ${MACHINE_ARCH} == "vax"
-COPTS += -O1
-.endif
-
 .include <bsd.lib.mk>

Reply via email to