Module Name:    src
Committed By:   kamil
Date:           Tue Jun  9 21:50:33 UTC 2020

Modified Files:
        src/distrib/sets/lists/comp: mi
        src/distrib/sets/lists/debug: mi
        src/external/apache2/llvm/bin: Makefile
        src/external/apache2/llvm/bin/llvm-symbolizer: Makefile
        src/external/apache2/llvm/lib: Makefile

Log Message:
Build and install llvm-symbolizer for MKLLVM=yes

llvm-symbolizer is an alternative for GNU addr2line(1), heavily used by the
LLVM sanitizers.

Do not install it as tools as it is not necessary as of today in that
stage.


To generate a diff of this commit:
cvs rdiff -u -r1.2334 -r1.2335 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.314 -r1.315 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/llvm/bin/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/apache2/llvm/bin/llvm-symbolizer/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2334 src/distrib/sets/lists/comp/mi:1.2335
--- src/distrib/sets/lists/comp/mi:1.2334	Mon Jun  8 16:36:18 2020
+++ src/distrib/sets/lists/comp/mi	Tue Jun  9 21:50:32 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2334 2020/06/08 16:36:18 maxv Exp $
+#	$NetBSD: mi,v 1.2335 2020/06/09 21:50:32 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -52,6 +52,7 @@
 ./usr/bin/lint					comp-c-bin
 ./usr/bin/lld					comp-obsolete		obsolete
 ./usr/bin/lldb					comp-obsolete		obsolete
+./usr/bin/llvm-symbolizer			comp-c-bin		llvm
 ./usr/bin/llvm-tblgen				comp-c-bin		llvm
 ./usr/bin/lorder				comp-util-bin
 ./usr/bin/luac					comp-util-bin

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.314 src/distrib/sets/lists/debug/mi:1.315
--- src/distrib/sets/lists/debug/mi:1.314	Mon Jun  8 02:54:41 2020
+++ src/distrib/sets/lists/debug/mi	Tue Jun  9 21:50:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.314 2020/06/08 02:54:41 rin Exp $
+# $NetBSD: mi,v 1.315 2020/06/09 21:50:32 kamil Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -635,6 +635,7 @@
 ./usr/libdata/debug/usr/bin/lex.debug		comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/lint.debug		comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/lkbib.debug		comp-groff-debug	groff,debug
+./usr/libdata/debug/usr/bin/llvm-symbolizer.debug	comp-c-debug		llvm,debug
 ./usr/libdata/debug/usr/bin/llvm-tblgen.debug	comp-c-debug		llvm,debug
 ./usr/libdata/debug/usr/bin/locale.debug	comp-locale-debug	debug
 ./usr/libdata/debug/usr/bin/locate.debug	comp-util-debug		debug

Index: src/external/apache2/llvm/bin/Makefile
diff -u src/external/apache2/llvm/bin/Makefile:1.1 src/external/apache2/llvm/bin/Makefile:1.2
--- src/external/apache2/llvm/bin/Makefile:1.1	Mon Nov 11 22:44:58 2019
+++ src/external/apache2/llvm/bin/Makefile	Tue Jun  9 21:50:32 2020
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:44:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2020/06/09 21:50:32 kamil Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	clang \
 	clang-tblgen \
-	tblgen
+	tblgen \
+	llvm-symbolizer
 
 .if defined(LLVM_DEVELOPER)
 SUBDIR+= \
@@ -32,7 +33,6 @@ SUBDIR+= \
 	llvm-readobj \
 	llvm-size \
 	llvm-strings \
-	llvm-symbolizer \
 	llvm-xray \
 	opt \
 	sancov \

Index: src/external/apache2/llvm/bin/llvm-symbolizer/Makefile
diff -u src/external/apache2/llvm/bin/llvm-symbolizer/Makefile:1.1 src/external/apache2/llvm/bin/llvm-symbolizer/Makefile:1.2
--- src/external/apache2/llvm/bin/llvm-symbolizer/Makefile:1.1	Mon Nov 11 22:45:01 2019
+++ src/external/apache2/llvm/bin/llvm-symbolizer/Makefile	Tue Jun  9 21:50:32 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/11/11 22:45:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2020/06/09 21:50:32 kamil Exp $
 
 PROG_CXX=	llvm-symbolizer
 NOMAN=		yes
@@ -21,6 +21,8 @@ LLVM_LIBS+= \
 	BitstreamReader \
 	IR \
 	BinaryFormat \
+	ObjectYAML \
+	TextAPI \
 	Support \
 	Demangle
 

Index: src/external/apache2/llvm/lib/Makefile
diff -u src/external/apache2/llvm/lib/Makefile:1.2 src/external/apache2/llvm/lib/Makefile:1.3
--- src/external/apache2/llvm/lib/Makefile:1.2	Sun Feb 23 02:01:17 2020
+++ src/external/apache2/llvm/lib/Makefile	Tue Jun  9 21:50:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/02/23 02:01:17 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/09 21:50:32 kamil Exp $
 
 .include <bsd.own.mk>
 
@@ -116,11 +116,12 @@ SUBDIR+= \
 	libLLVMRuntimeDyld
 .endif
 
-.if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
+.if !defined(HOSTLIB) && !defined(_BSD_HOSTINIT_MK_)
 SUBDIR+= \
 	libLLVMDebugInfoPDB \
 	libLLVMDebugInfoPDBNative \
-	libLLVMDebugInfoSymbolize
+	libLLVMDebugInfoSymbolize \
+	libLLVMObjectYAML
 .endif
 
 .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes"
@@ -129,7 +130,6 @@ SUBDIR+= \
 	libLLVMHello \
 	libLLVMInterpreter \
 	libLLVMLineEditor \
-	libLLVMObjectYAML \
 	libLLVMToolDrivers \
 	libLLVMToolDriversDlltool \
 	libLLVMXRay

Reply via email to