Module Name: src
Committed By: mrg
Date: Wed Oct 2 06:52:00 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux_libcdep.cc sanitizer_platform_limits_posix.cc
src/external/gpl3/gcc/lib: Makefile.sanitizer
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
src/external/gpl3/gcc/lib/libubsan: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
Removed Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_procmaps_netbsd.cc
Log Message:
make most of this compile:
- sanitizer_procmaps_netbsd.cc is obsolete.
- fix merge botches where upstrem has as slightly different version
is upstream than prior local
- libstdc++ default is now gnu++17
- ubsan needs UBSAN_CAN_USE_CXXABI set
- properly use $G_RTL_BASE_H not (empty) $RTL_BASE_H
- libbackend HH gains new generated insn-modes-inline.h, and read-md.c
gains the HH dep.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
cvs rdiff -u -r1.3 -r0 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_procmaps_netbsd.cc
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/Makefile.sanitizer
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/lib/libsupc++/Makefile.common
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/gpl3/gcc/usr.bin/backend/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/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.10 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.11
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.10 Tue Oct 1 11:49:13 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc Wed Oct 2 06:51:59 2019
@@ -369,12 +369,6 @@ uptr ThreadSelf() {
uptr ThreadSelf() { return (uptr)pthread_self(); }
#endif // SANITIZER_NETBSD
-#if SANITIZER_NETBSD
-uptr ThreadSelf() {
- return (uptr)pthread_self();
-}
-#endif // SANITIZER_NETBSD
-
#if !SANITIZER_GO
static void GetTls(uptr *addr, uptr *size) {
#if SANITIZER_LINUX && !SANITIZER_ANDROID
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:1.12 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:1.13
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:1.12 Tue Oct 1 10:38:23 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc Wed Oct 2 06:51:59 2019
@@ -76,18 +76,12 @@
#include <net/if_arp.h>
#endif
-#if SANITIZER_FREEBSD
-# include <sys/consio.h>
-# include <sys/kbio.h>
-# include <sys/link_elf.h>
-# include <net/ethernet.h>
-#endif
-
#if SANITIZER_NETBSD
# include <link_elf.h>
# include <net/if_ether.h>
# define statfs statvfs
# define d_ino d_fileno
+# include "sanitizer_platform_limits_netbsd.h"
#endif
#if SANITIZER_FREEBSD || SANITIZER_NETBSD
Index: src/external/gpl3/gcc/lib/Makefile.sanitizer
diff -u src/external/gpl3/gcc/lib/Makefile.sanitizer:1.8 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.9
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.8 Wed Oct 2 02:54:34 2019
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer Wed Oct 2 06:51:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sanitizer,v 1.8 2019/10/02 02:54:34 mrg Exp $
+# $NetBSD: Makefile.sanitizer,v 1.9 2019/10/02 06:51:59 mrg Exp $
SANITIZER=${GCCDIST}/libsanitizer
.PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -37,7 +37,6 @@ SANITIZER_SRCS+= \
sanitizer_printf.cc \
sanitizer_procmaps_common.cc \
sanitizer_procmaps_freebsd.cc \
- sanitizer_procmaps_netbsd.cc \
sanitizer_procmaps_linux.cc \
sanitizer_procmaps_mac.cc \
sanitizer_stackdepot.cc \
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.13 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.14
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.13 Thu Feb 28 01:11:04 2019
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Wed Oct 2 06:51:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2019/02/28 01:11:04 mrg Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/10/02 06:51:59 mrg Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@@ -57,7 +57,7 @@ STD_GNU14= \
del_opvs.cc
.for _f in ${STD_GNU14} ${G_FILESYSTEM_SOURCES:M*.cc}
-COPTS.${_f}+= -std=gnu++14 -Wno-sized-deallocation
+COPTS.${_f}+= -std=gnu++17 -Wno-sized-deallocation
.endfor
STD_GNU1Z= \
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.12 src/external/gpl3/gcc/lib/libubsan/Makefile:1.13
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.12 Wed Oct 2 02:54:35 2019
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Wed Oct 2 06:51:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/02 02:54:35 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/02 06:51:59 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -31,6 +31,6 @@ COPTS.ubsan_handlers_cxx.cc+= -Wno-error
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
-CPPFLAGS+=-DCAN_SANITIZE_UB=1
+CPPFLAGS+=-DCAN_SANITIZE_UB=1 -DUBSAN_CAN_USE_CXXABI=1
.include <bsd.lib.mk>
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.55 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.56
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.55 Sat Feb 9 21:03:24 2019
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Wed Oct 2 06:52:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/02/09 21:03:24 maya Exp $
+# $NetBSD: Makefile,v 1.56 2019/10/02 06:52:00 mrg Exp $
LIBISPRIVATE= yes
@@ -71,7 +71,7 @@ COPTS.varasm.c= -Wno-error
# Headers that host objects depend on (except gen*rtl*)
HH_NORTL= ${G_tm_file_list} ${G_build_xm_include_list}
-HH= ${HH_NORTL} genrtl.h insn-modes.h
+HH= ${HH_NORTL} genrtl.h insn-modes.h insn-modes-inline.h
#
# Generate the various header files we need.
@@ -161,12 +161,15 @@ insn-modes.h-test: genmodes
min-insn-modes.c: genmodes
${_MKTARGET_CREATE}
./genmodes -m >${.TARGET}
+insn-modes-inline.h: genmodes
+ ${_MKTARGET_CREATE}
+ ./genmodes -i >${.TARGET}
genmodes.lo: ${HH_NORTL}
genmodes: genmodes.lo build-errors.lo
${_MKTARGET_LINK}
${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
-CLEANFILES+= genmodes insn-modes.c insn-modes.h-test min-insn-modes.c
+CLEANFILES+= genmodes insn-modes.c insn-modes.h-test min-insn-modes.c insn-modes-inline.h
gimple-match.c: genmatch cfn-operators.pd
./genmatch --gimple ${GNUHOSTDIST}/gcc/match.pd > gimple-match.c.tmp
@@ -257,7 +260,7 @@ build-print-rtl.c: print-rtl.c \
${GNUHOSTDIST}/gcc/print-rtl.c >${.TARGET}
build-print-rtl.lo: ${HH}
build-print-rtl.o: print-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
- $(GTM_H) $(RTL_BASE_H)
+ ${GTM_H} ${G_RTL_BASE_H}
CLEANFILES+= build-print-rtl.c
build-bitmap.c: bitmap.c \
@@ -313,7 +316,7 @@ build-genattrtab.o: ${G_GGC_H}
#
# The normal insn-foo generators
#
-.for f in gensupport.c read-rtl.c dummy-conditions.c
+.for f in gensupport.c read-rtl.c dummy-conditions.c read-md.c
${f:R}.lo: ${HH}
.endfor
