[src/netbsd-9]: src/external/bsd/compiler_rt/lib/clang/lib/netbsd Pull up fol...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa1e23aa384c
branches:  netbsd-9
changeset: 843165:fa1e23aa384c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 01 14:12:22 2019 +0000

description:
Pull up following revision(s) (requested by kamil in ticket #149):

        external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk: revision 1.3
        external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile: revision 1.4
        external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile: revision 1.4

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.

diffstat:

 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile                 |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile             |  5 +++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile                 |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile             |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk                           |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile                 |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile             |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile        |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile     |  3 ++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile |  3 ++-
 10 files changed, 21 insertions(+), 11 deletions(-)

diffs (170 lines):

diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:24 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:23 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -55,6 +55,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.asan-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/asan/asan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile       Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile       Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:23 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:22 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -37,7 +37,8 @@
 .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}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:23 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:23 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -50,6 +50,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.msan-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/msan/msan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile       Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile       Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:22 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:22 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -39,6 +39,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.msan_cxx-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/msan/msan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk     Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk     Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: syms.mk,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $
+#      $NetBSD: syms.mk,v 1.1.2.4 2019/09/01 14:12:23 martin Exp $
 
 here := ${.PARSEDIR}
 
@@ -8,4 +8,5 @@
        NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \
                ${HOST_SH} \
                ${here}/gen_dynamic_list.sh \
+               --extra ${SYMS_EXTRA:Q} \
                ${.IMPSRC} > ${.TARGET}
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile   Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile   Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:24 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:23 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -50,6 +50,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.tsan-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile       Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile       Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:24 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:23 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -38,6 +38,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.tsan_cxx-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile  Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile  Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:22 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:22 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -34,6 +34,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.ubsan_minimal-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/ubsan_minimal/ubsan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile       Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile       Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:23 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:23 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -48,6 +48,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.ubsan_standalone-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
 beforeinstall: ${SYMS}
 
diff -r 47eea1013576 -r fa1e23aa384c external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile   Sun Sep 01 14:06:22 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile   Sun Sep 01 14:12:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.4 2019/09/01 10:44:23 martin Exp $
+#      $NetBSD: Makefile,v 1.1.2.5 2019/09/01 14:12:22 martin Exp $
 
 NOSANITIZER=    # defined
 
@@ -34,6 +34,7 @@
 .include "../syms.mk"
 
 SYMS=          libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+SYMS_EXTRA=    ${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
 beforeinstall: ${SYMS}