Module Name:    src
Committed By:   kamil
Date:           Fri Aug 30 23:36:41 UTC 2019

Modified Files:
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd: syms.mk
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64:
            Makefile
        
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64:
            Makefile

Log Message:
Register syms.extra in LLVM sanitizer .syms files

syms.extra contain additional content that has to be shipped with these
.syms files.

At least libFuzzer requires the .syms files to be in order.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-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/syms.mk
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.3
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.2	Mon Aug 26 04:49:45 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk	Fri Aug 30 23:36:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: syms.mk,v 1.2 2019/08/26 04:49:45 kamil Exp $
+#	$NetBSD: syms.mk,v 1.3 2019/08/30 23:36:40 kamil Exp $
 
 here := ${.PARSEDIR}
 
@@ -8,4 +8,5 @@ here := ${.PARSEDIR}
 	NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \
 		${HOST_SH} \
 		${here}/gen_dynamic_list.sh \
+		--extra ${SYMS_EXTRA:Q} \
 		${.IMPSRC} > ${.TARGET}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.3	Tue Aug 27 22:48:54 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile	Fri Aug 30 23:36:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -55,6 +55,7 @@ COPTS+=		-fPIC
 .include "../syms.mk"
 
 SYMS=		libclang_rt.asan-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.3	Tue Aug 27 22:48:54 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile	Fri Aug 30 23:36:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -37,7 +37,8 @@ COPTS+=		-fPIC
 .include "../m64.mk"
 .include "../syms.mk"
 
-SYMS=	libclang_rt.asan_cxx-x86_64.a.syms
+SYMS=		libclang_rt.asan_cxx-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.3	Tue Aug 27 22:48:54 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile	Fri Aug 30 23:36:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -50,6 +50,7 @@ COPTS+=		-fPIC
 .include "../syms.mk"
 
 SYMS=		libclang_rt.msan-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/msan/msan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.3	Tue Aug 27 22:48:54 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile	Fri Aug 30 23:36:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -39,6 +39,7 @@ COPTS+=		-fPIC
 .include "../syms.mk"
 
 SYMS=		libclang_rt.msan_cxx-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/msan/msan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.3	Tue Aug 27 22:48:54 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile	Fri Aug 30 23:36:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -50,6 +50,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 .include "../syms.mk"
 
 SYMS=		libclang_rt.tsan-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.3	Tue Aug 27 22:48:55 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile	Fri Aug 30 23:36:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -38,6 +38,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 .include "../syms.mk"
 
 SYMS=		libclang_rt.tsan_cxx-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.3	Tue Aug 27 22:48:55 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile	Fri Aug 30 23:36:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -34,6 +34,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 .include "../syms.mk"
 
 SYMS=		libclang_rt.ubsan_minimal-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/ubsan_minimal/ubsan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.3	Tue Aug 27 22:48:55 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile	Fri Aug 30 23:36:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -48,6 +48,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 .include "../syms.mk"
 
 SYMS=		libclang_rt.ubsan_standalone-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
 beforeinstall: ${SYMS}
 

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.3	Tue Aug 27 22:48:55 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile	Fri Aug 30 23:36:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $
+#	$NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -34,6 +34,7 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 .include "../syms.mk"
 
 SYMS=		libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+SYMS_EXTRA=	${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
 beforeinstall: ${SYMS}
 

Reply via email to