Module Name: src
Committed By: mrg
Date: Thu Jun 9 07:11:08 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib: Makefile.sanitizer
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
apply -O1 more liberally for vax. fixes build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/Makefile.sanitizer
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.1 -r1.2 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.1 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.2
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.1 Wed Jun 1 22:48:55 2016
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer Thu Jun 9 07:11:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sanitizer,v 1.1 2016/06/01 22:48:55 christos Exp $
+# $NetBSD: Makefile.sanitizer,v 1.2 2016/06/09 07:11:08 mrg Exp $
SANITIZER=${GCCDIST}/libsanitizer
.PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -69,8 +69,14 @@ COPTS+=-fno-builtin -fno-exceptions -fno
#-fomit-frame-pointer
.if ${MACHINE_ARCH} == "vax"
+COPTS.sanitizer_allocator.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_printf.cc += -O1
+COPTS.sanitizer_procmaps_common.cc += -O1
COPTS.sanitizer_stackdepot.cc += -O1
+COPTS.sanitizer_symbolizer_libcdep.cc += -O1
.endif
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.16 src/external/gpl3/gcc/lib/libasan/Makefile:1.17
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.16 Wed Jun 1 22:48:55 2016
+++ src/external/gpl3/gcc/lib/libasan/Makefile Thu Jun 9 07:11:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/06/01 22:48:55 christos Exp $
+# $NetBSD: Makefile,v 1.17 2016/06/09 07:11:08 mrg Exp $
.include <bsd.own.mk>
@@ -36,6 +36,7 @@ SRCS+= ${ASAN_SRCS}
.if ${MACHINE_ARCH} == "vax"
COPTS.asan_allocator2.cc += -O1
+COPTS.asan_report.cc += -O1
.endif
.include <bsd.lib.mk>
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.1 src/external/gpl3/gcc/lib/libubsan/Makefile:1.2
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.1 Wed Jun 1 22:48:55 2016
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Thu Jun 9 07:11:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/06/01 22:48:55 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/09 07:11:08 mrg Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -7,17 +7,21 @@
.PATH: ${SANITIZER}/ubsan
UBSAN_SRCS= \
-ubsan_diag.o \
-ubsan_flags.o \
-ubsan_handlers.o \
-ubsan_handlers_cxx.o \
-ubsan_init.o \
-ubsan_type_hash.o \
-ubsan_value.o
+ ubsan_diag.o \
+ ubsan_flags.o \
+ ubsan_handlers.o \
+ ubsan_handlers_cxx.o \
+ ubsan_init.o \
+ ubsan_type_hash.o \
+ ubsan_value.o
COPTS.ubsan_type_hash.cc+=-frtti
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
+.if ${MACHINE_ARCH} == "vax"
+COPTS += -O1
+.endif
+
.include <bsd.lib.mk>
