Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/compiler_rt/lib/clang/lib/netbsd - get the vers...



details:   https://anonhg.NetBSD.org/src/rev/6f20a2b32179
branches:  trunk
changeset: 1023589:6f20a2b32179
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 17 02:18:01 2021 +0000

description:
- get the version dynamically
- move more common stuff into common.mk

diffstat:

 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile             |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile             |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile                     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile                     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile             |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile             |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile                 |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile                 |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk                             |  11 +++++++++-
 external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile                       |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile                    |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile                   |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile           |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile                     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile                 |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile                |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile                |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile                     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile                 |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32/Makefile    |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64/Makefile    |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32/Makefile            |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile            |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32/Makefile |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64/Makefile |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32/Makefile         |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile         |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32/Makefile     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64/Makefile               |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64/Makefile                 |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile                     |   8 +------
 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile           |   8 +------
 33 files changed, 42 insertions(+), 225 deletions(-)

diffs (truncated from 625 to 300 lines):

diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:28 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:01 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-i386
 
 .PATH: ${TOPDIR}/lib/interception
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:01 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-x86_64
 
 .PATH: ${TOPDIR}/lib/interception
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-i386
 
 .PATH: ${TOPDIR}/lib/interception
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.6 2021/05/04 17:23:53 rillig Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.7 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-x86_64
 
 .PATH: ${TOPDIR}/lib/interception
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-preinit-i386
 
 .PATH: ${TOPDIR}/lib/asan
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan-preinit-x86_64
 
 .PATH: ${TOPDIR}/lib/asan
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile       Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile       Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan_cxx-i386
 
 .PATH: ${TOPDIR}/lib/asan
diff -r 1e948dd36536 -r 6f20a2b32179 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       Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile       Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.6 2021/05/04 17:23:53 rillig Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.7 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.asan_cxx-x86_64
 
 .PATH: ${TOPDIR}/lib/asan
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk   Fri Sep 17 02:18:01 2021 +0000
@@ -1,3 +1,12 @@
-CLANG_VER=     13.0.0
+# $NetBSD: common.mk,v 1.6 2021/09/17 02:18:01 christos Exp $
+
+NOSANITIZER=   # defined
 NODEBUG=       # defined
 NOLIBCSANITIZER=# defined
+
+.include <bsd.own.mk>
+
+TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+
+CLANG_VER!=    cd ${NETBSDSRCDIR}/external/apache2/llvm && \
+    ${MAKE} -V LLVM_VERSION
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile     Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile     Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.dd-x86_64
 
 .PATH: ${TOPDIR}/lib/tsan/dd
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile  Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile  Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.dyndd-x86_64
 
 .PATH: ${TOPDIR}/lib/tsan/dd
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:02 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.fuzzer-x86_64
 
 .PATH: ${TOPDIR}/lib/fuzzer
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.2 2021/09/17 02:18:03 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.fuzzer_no_main-x86_64
 
 .PATH: ${TOPDIR}/lib/fuzzer
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.6 2021/05/04 17:23:54 rillig Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.7 2021/09/17 02:18:03 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.msan-x86_64
 
 .PATH: ${TOPDIR}/lib/ubsan
diff -r 1e948dd36536 -r 6f20a2b32179 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       Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile       Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.6 2021/05/04 17:23:54 rillig Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.7 2021/09/17 02:18:03 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.msan_cxx-x86_64
 
 .PATH: ${TOPDIR}/lib/ubsan
diff -r 1e948dd36536 -r 6f20a2b32179 external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile      Fri Sep 17 02:12:16 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile      Fri Sep 17 02:18:01 2021 +0000
@@ -1,14 +1,8 @@
-#      $NetBSD: Makefile,v 1.2 2019/08/23 19:26:02 kamil Exp $
-
-NOSANITIZER=    # defined
+#      $NetBSD: Makefile,v 1.3 2021/09/17 02:18:03 christos Exp $
 
 .include "../common.mk"
 .include "../sources.mk"
 
-.include <bsd.own.mk>
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
 LIB=   libclang_rt.safestack-i386



Home | Main Index | Thread Index | Old Index