Fri Aug 30 23:36:41 2019 UTC ()
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.


(kamil)
diff -r1.2 -r1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
cvs diff -r1.2 -r1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk 2019/08/26 04:49:45 1.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk 2019/08/30 23:36:40 1.3
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1# $NetBSD: syms.mk,v 1.2 2019/08/26 04:49:45 kamil Exp $ 1# $NetBSD: syms.mk,v 1.3 2019/08/30 23:36:40 kamil Exp $
2 2
3here := ${.PARSEDIR} 3here := ${.PARSEDIR}
4 4
5.SUFFIXES: .a .a.syms 5.SUFFIXES: .a .a.syms
6.a.a.syms: 6.a.a.syms:
7 ${_MKTARGET_CREATE} 7 ${_MKTARGET_CREATE}
8 NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \ 8 NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \
9 ${HOST_SH} \ 9 ${HOST_SH} \
10 ${here}/gen_dynamic_list.sh \ 10 ${here}/gen_dynamic_list.sh \
 11 --extra ${SYMS_EXTRA:Q} \
11 ${.IMPSRC} > ${.TARGET} 12 ${.IMPSRC} > ${.TARGET}
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile 2019/08/27 22:48:54 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile 2019/08/30 23:36:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.asan-x86_64 12LIB= libclang_rt.asan-x86_64
13 13
14.PATH: ${TOPDIR}/lib/interception 14.PATH: ${TOPDIR}/lib/interception
@@ -45,21 +45,22 @@ MKDEBUGLIB= no @@ -45,21 +45,22 @@ MKDEBUGLIB= no
45MKLINT= no 45MKLINT= no
46MKPICINSTALL= no 46MKPICINSTALL= no
47MKPROFILE= no 47MKPROFILE= no
48MKSTATICLIB= yes 48MKSTATICLIB= yes
49 49
50CPPFLAGS+= -I${TOPDIR}/lib 50CPPFLAGS+= -I${TOPDIR}/lib
51 51
52COPTS+= -fPIC 52COPTS+= -fPIC
53 53
54.include "../m64.mk" 54.include "../m64.mk"
55.include "../syms.mk" 55.include "../syms.mk"
56 56
57SYMS= libclang_rt.asan-x86_64.a.syms 57SYMS= libclang_rt.asan-x86_64.a.syms
 58SYMS_EXTRA= ${TOPDIR}/lib/asan/asan.syms.extra
58 59
59beforeinstall: ${SYMS} 60beforeinstall: ${SYMS}
60 61
61CLEANFILES+= ${SYMS} 62CLEANFILES+= ${SYMS}
62FILES= ${SYMS} 63FILES= ${SYMS}
63FILESDIR= ${LIBDIR} 64FILESDIR= ${LIBDIR}
64 65
65.include <bsd.lib.mk> 66.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile 2019/08/27 22:48:54 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile 2019/08/30 23:36:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.asan_cxx-x86_64 12LIB= libclang_rt.asan_cxx-x86_64
13 13
14.PATH: ${TOPDIR}/lib/asan 14.PATH: ${TOPDIR}/lib/asan
@@ -27,22 +27,23 @@ LIBISCXX= yes @@ -27,22 +27,23 @@ LIBISCXX= yes
27_LIB_PREFIX= 27_LIB_PREFIX=
28MKDEBUGLIB= no 28MKDEBUGLIB= no
29MKLINT= no 29MKLINT= no
30MKPICINSTALL= no 30MKPICINSTALL= no
31MKPROFILE= no 31MKPROFILE= no
32MKSTATICLIB= yes 32MKSTATICLIB= yes
33 33
34CPPFLAGS+= -I${TOPDIR}/lib 34CPPFLAGS+= -I${TOPDIR}/lib
35COPTS+= -fPIC 35COPTS+= -fPIC
36 36
37.include "../m64.mk" 37.include "../m64.mk"
38.include "../syms.mk" 38.include "../syms.mk"
39 39
40SYMS= libclang_rt.asan_cxx-x86_64.a.syms 40SYMS= libclang_rt.asan_cxx-x86_64.a.syms
 41SYMS_EXTRA= ${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
41 42
42beforeinstall: ${SYMS} 43beforeinstall: ${SYMS}
43 44
44CLEANFILES+= ${SYMS} 45CLEANFILES+= ${SYMS}
45FILES= ${SYMS} 46FILES= ${SYMS}
46FILESDIR= ${LIBDIR} 47FILESDIR= ${LIBDIR}
47 48
48.include <bsd.lib.mk> 49.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile 2019/08/27 22:48:54 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile 2019/08/30 23:36:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.msan-x86_64 12LIB= libclang_rt.msan-x86_64
13 13
14.PATH: ${TOPDIR}/lib/ubsan 14.PATH: ${TOPDIR}/lib/ubsan
@@ -40,21 +40,22 @@ MKDEBUGLIB= no @@ -40,21 +40,22 @@ MKDEBUGLIB= no
40MKLINT= no 40MKLINT= no
41MKPICINSTALL= no 41MKPICINSTALL= no
42MKPROFILE= no 42MKPROFILE= no
43MKSTATICLIB= yes 43MKSTATICLIB= yes
44 44
45CPPFLAGS+= -I${TOPDIR}/lib 45CPPFLAGS+= -I${TOPDIR}/lib
46 46
47COPTS+= -fPIC 47COPTS+= -fPIC
48 48
49.include "../m64.mk" 49.include "../m64.mk"
50.include "../syms.mk" 50.include "../syms.mk"
51 51
52SYMS= libclang_rt.msan-x86_64.a.syms 52SYMS= libclang_rt.msan-x86_64.a.syms
 53SYMS_EXTRA= ${TOPDIR}/lib/msan/msan.syms.extra
53 54
54beforeinstall: ${SYMS} 55beforeinstall: ${SYMS}
55 56
56CLEANFILES+= ${SYMS} 57CLEANFILES+= ${SYMS}
57FILES= ${SYMS} 58FILES= ${SYMS}
58FILESDIR= ${LIBDIR} 59FILESDIR= ${LIBDIR}
59 60
60.include <bsd.lib.mk> 61.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile 2019/08/27 22:48:54 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile 2019/08/30 23:36:40 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.msan_cxx-x86_64 12LIB= libclang_rt.msan_cxx-x86_64
13 13
14.PATH: ${TOPDIR}/lib/ubsan 14.PATH: ${TOPDIR}/lib/ubsan
@@ -29,21 +29,22 @@ MKDEBUGLIB= no @@ -29,21 +29,22 @@ MKDEBUGLIB= no
29MKLINT= no 29MKLINT= no
30MKPICINSTALL= no 30MKPICINSTALL= no
31MKPROFILE= no 31MKPROFILE= no
32MKSTATICLIB= yes 32MKSTATICLIB= yes
33 33
34CPPFLAGS+= -I${TOPDIR}/lib 34CPPFLAGS+= -I${TOPDIR}/lib
35 35
36COPTS+= -fPIC 36COPTS+= -fPIC
37 37
38.include "../m64.mk" 38.include "../m64.mk"
39.include "../syms.mk" 39.include "../syms.mk"
40 40
41SYMS= libclang_rt.msan_cxx-x86_64.a.syms 41SYMS= libclang_rt.msan_cxx-x86_64.a.syms
 42SYMS_EXTRA= ${TOPDIR}/lib/msan/msan.syms.extra
42 43
43beforeinstall: ${SYMS} 44beforeinstall: ${SYMS}
44 45
45CLEANFILES+= ${SYMS} 46CLEANFILES+= ${SYMS}
46FILES= ${SYMS} 47FILES= ${SYMS}
47FILESDIR= ${LIBDIR} 48FILESDIR= ${LIBDIR}
48 49
49.include <bsd.lib.mk> 50.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile 2019/08/27 22:48:54 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile 2019/08/30 23:36:41 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:54 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.tsan-x86_64 12LIB= libclang_rt.tsan-x86_64
13 13
14.PATH: ${TOPDIR}/lib/ubsan 14.PATH: ${TOPDIR}/lib/ubsan
@@ -40,21 +40,22 @@ _LIB_PREFIX= @@ -40,21 +40,22 @@ _LIB_PREFIX=
40MKDEBUGLIB= no 40MKDEBUGLIB= no
41MKLINT= no 41MKLINT= no
42MKPICINSTALL= no 42MKPICINSTALL= no
43MKPROFILE= no 43MKPROFILE= no
44MKSTATICLIB= yes 44MKSTATICLIB= yes
45 45
46COPTS+= -fPIC 46COPTS+= -fPIC
47CPPFLAGS+= -I${TOPDIR}/lib 47CPPFLAGS+= -I${TOPDIR}/lib
48 48
49.include "../m64.mk" 49.include "../m64.mk"
50.include "../syms.mk" 50.include "../syms.mk"
51 51
52SYMS= libclang_rt.tsan-x86_64.a.syms 52SYMS= libclang_rt.tsan-x86_64.a.syms
 53SYMS_EXTRA= ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
53 54
54beforeinstall: ${SYMS} 55beforeinstall: ${SYMS}
55 56
56CLEANFILES+= ${SYMS} 57CLEANFILES+= ${SYMS}
57FILES= ${SYMS} 58FILES= ${SYMS}
58FILESDIR= ${LIBDIR} 59FILESDIR= ${LIBDIR}
59 60
60.include <bsd.lib.mk> 61.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile 2019/08/27 22:48:55 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile 2019/08/30 23:36:41 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.tsan_cxx-x86_64 12LIB= libclang_rt.tsan_cxx-x86_64
13 13
14.PATH: ${TOPDIR}/lib/tsan/rtl 14.PATH: ${TOPDIR}/lib/tsan/rtl
@@ -28,21 +28,22 @@ _LIB_PREFIX= @@ -28,21 +28,22 @@ _LIB_PREFIX=
28MKDEBUGLIB= no 28MKDEBUGLIB= no
29MKLINT= no 29MKLINT= no
30MKPICINSTALL= no 30MKPICINSTALL= no
31MKPROFILE= no 31MKPROFILE= no
32MKSTATICLIB= yes 32MKSTATICLIB= yes
33 33
34COPTS+= -fPIC 34COPTS+= -fPIC
35CPPFLAGS+= -I${TOPDIR}/lib 35CPPFLAGS+= -I${TOPDIR}/lib
36 36
37.include "../m64.mk" 37.include "../m64.mk"
38.include "../syms.mk" 38.include "../syms.mk"
39 39
40SYMS= libclang_rt.tsan_cxx-x86_64.a.syms 40SYMS= libclang_rt.tsan_cxx-x86_64.a.syms
 41SYMS_EXTRA= ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
41 42
42beforeinstall: ${SYMS} 43beforeinstall: ${SYMS}
43 44
44CLEANFILES+= ${SYMS} 45CLEANFILES+= ${SYMS}
45FILES= ${SYMS} 46FILES= ${SYMS}
46FILESDIR= ${LIBDIR} 47FILESDIR= ${LIBDIR}
47 48
48.include <bsd.lib.mk> 49.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile 2019/08/27 22:48:55 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile 2019/08/30 23:36:41 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.ubsan_minimal-x86_64 12LIB= libclang_rt.ubsan_minimal-x86_64
13 13
14.PATH: ${TOPDIR}/lib/ubsan_minimal 14.PATH: ${TOPDIR}/lib/ubsan_minimal
@@ -24,21 +24,22 @@ _LIB_PREFIX= @@ -24,21 +24,22 @@ _LIB_PREFIX=
24MKDEBUGLIB= no 24MKDEBUGLIB= no
25MKLINT= no 25MKLINT= no
26MKPICINSTALL= no 26MKPICINSTALL= no
27MKPROFILE= no 27MKPROFILE= no
28MKSTATICLIB= yes 28MKSTATICLIB= yes
29 29
30COPTS+= -fPIC 30COPTS+= -fPIC
31CPPFLAGS+= -I${TOPDIR}/lib 31CPPFLAGS+= -I${TOPDIR}/lib
32 32
33.include "../m64.mk" 33.include "../m64.mk"
34.include "../syms.mk" 34.include "../syms.mk"
35 35
36SYMS= libclang_rt.ubsan_minimal-x86_64.a.syms 36SYMS= libclang_rt.ubsan_minimal-x86_64.a.syms
 37SYMS_EXTRA= ${TOPDIR}/lib/ubsan_minimal/ubsan.syms.extra
37 38
38beforeinstall: ${SYMS} 39beforeinstall: ${SYMS}
39 40
40CLEANFILES+= ${SYMS} 41CLEANFILES+= ${SYMS}
41FILES= ${SYMS} 42FILES= ${SYMS}
42FILESDIR= ${LIBDIR} 43FILESDIR= ${LIBDIR}
43 44
44.include <bsd.lib.mk> 45.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile 2019/08/27 22:48:55 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile 2019/08/30 23:36:41 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.ubsan_standalone-x86_64 12LIB= libclang_rt.ubsan_standalone-x86_64
13 13
14.PATH: ${TOPDIR}/lib/interception 14.PATH: ${TOPDIR}/lib/interception
@@ -38,21 +38,22 @@ _LIB_PREFIX= @@ -38,21 +38,22 @@ _LIB_PREFIX=
38MKDEBUGLIB= no 38MKDEBUGLIB= no
39MKLINT= no 39MKLINT= no
40MKPICINSTALL= no 40MKPICINSTALL= no
41MKPROFILE= no 41MKPROFILE= no
42MKSTATICLIB= yes 42MKSTATICLIB= yes
43 43
44COPTS+= -fPIC 44COPTS+= -fPIC
45CPPFLAGS+= -I${TOPDIR}/lib 45CPPFLAGS+= -I${TOPDIR}/lib
46 46
47.include "../m64.mk" 47.include "../m64.mk"
48.include "../syms.mk" 48.include "../syms.mk"
49 49
50SYMS= libclang_rt.ubsan_standalone-x86_64.a.syms 50SYMS= libclang_rt.ubsan_standalone-x86_64.a.syms
 51SYMS_EXTRA= ${TOPDIR}/lib/ubsan/ubsan.syms.extra
51 52
52beforeinstall: ${SYMS} 53beforeinstall: ${SYMS}
53 54
54CLEANFILES+= ${SYMS} 55CLEANFILES+= ${SYMS}
55FILES= ${SYMS} 56FILES= ${SYMS}
56FILESDIR= ${LIBDIR} 57FILESDIR= ${LIBDIR}
57 58
58.include <bsd.lib.mk> 59.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile (expand / switch to unified diff)

--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile 2019/08/27 22:48:55 1.3
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile 2019/08/30 23:36:41 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2019/08/27 22:48:55 kamil Exp $ 1# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
2 2
3NOSANITIZER= # defined 3NOSANITIZER= # defined
4 4
5.include "../common.mk" 5.include "../common.mk"
6.include "../sources.mk" 6.include "../sources.mk"
7 7
8.include <bsd.own.mk> 8.include <bsd.own.mk>
9 9
10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist 10TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
11 11
12LIB= libclang_rt.ubsan_standalone_cxx-x86_64 12LIB= libclang_rt.ubsan_standalone_cxx-x86_64
13 13
14.PATH: ${TOPDIR}/lib/ubsan 14.PATH: ${TOPDIR}/lib/ubsan
@@ -24,21 +24,22 @@ _LIB_PREFIX= @@ -24,21 +24,22 @@ _LIB_PREFIX=
24MKDEBUGLIB= no 24MKDEBUGLIB= no
25MKLINT= no 25MKLINT= no
26MKPICINSTALL= no 26MKPICINSTALL= no
27MKPROFILE= no 27MKPROFILE= no
28MKSTATICLIB= yes 28MKSTATICLIB= yes
29 29
30COPTS+= -fPIC 30COPTS+= -fPIC
31CPPFLAGS+= -I${TOPDIR}/lib 31CPPFLAGS+= -I${TOPDIR}/lib
32 32
33.include "../m64.mk" 33.include "../m64.mk"
34.include "../syms.mk" 34.include "../syms.mk"
35 35
36SYMS= libclang_rt.ubsan_standalone_cxx-x86_64.a.syms 36SYMS= libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 37SYMS_EXTRA= ${TOPDIR}/lib/ubsan/ubsan.syms.extra
37 38
38beforeinstall: ${SYMS} 39beforeinstall: ${SYMS}
39 40
40CLEANFILES+= ${SYMS} 41CLEANFILES+= ${SYMS}
41FILES= ${SYMS} 42FILES= ${SYMS}
42FILESDIR= ${LIBDIR} 43FILESDIR= ${LIBDIR}
43 44
44.include <bsd.lib.mk> 45.include <bsd.lib.mk>