Module Name: src
Committed By: kamil
Date: Fri Aug 23 19:26:03 UTC 2019
Modified Files:
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64: Makefile
Log Message:
Fix LLVM sanitizer build by GCC (HAVE_LLVM=no)
Do not error if a priority from 0 to 100 is used for constructor or
destructor.
Use -Wno-error to silence all errors from this warning type. There should
be used -Wno-prio-ctor-dtor, but it's not supported by GCC7.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/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/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.1 Thu Aug 8 14:00:30 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile Fri Aug 23 19:26:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/23 19:26:02 kamil Exp $
NOSANITIZER= # defined
@@ -26,6 +26,8 @@ SRCS+= ${SANITIZER_NOLIBC_SOURCES}
CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector
+COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :}
+
LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd
LIBISCXX= yes
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.1 Thu Aug 8 14:00:30 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile Fri Aug 23 19:26:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/23 19:26:02 kamil Exp $
NOSANITIZER= # defined
@@ -26,6 +26,8 @@ SRCS+= ${SANITIZER_NOLIBC_SOURCES}
CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector
+COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :}
+
LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd
LIBISCXX= yes
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.1 Thu Aug 8 14:00:32 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile Fri Aug 23 19:26:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/08 14:00:32 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/23 19:26:02 kamil Exp $
NOSANITIZER= # defined
@@ -23,6 +23,8 @@ SRCS+= ${SANITIZER_LIBCDEP_SOURCES}
CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector
+COPTS.xray_init.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :}
+
# Macro defined in newer builtin subdirectory, it has to be empty on NetBSD
CPPFLAGS+= -DNO_EXEC_STACK_DIRECTIVE=""
