d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r367304:

Browse Source 
Add WITH_LLVM_CXXFILT option to install llvm-cxxfilt as c++filt

Since elftoolchain's cxxfilt is rather far behind on features, and we
ran into several bugs, add an option to use llvm-cxxfilt as an drop-in
replacement.

It supports the same options as elftoolchain cxxfilt, though it doesn't
have support for old ARM (C++ Annotated Reference Manual, not the CPU)
and GNU v2 manglings. But these are irrelevant in 2020.

Note: as we already compile the required libraries as part of libllvm,
this will not add any significant build time either.

PR:		250702
Reviewed by:	emaste, yuri
Differential Revision: https://reviews.freebsd.org/D27071

MFC r367712:

Ensure make delete-old does not unlink the llvm-cxxfilt and its manpage,
after r367304 and r367324, when WITH_LLVM_CXXFILT is enabled.

Noticed by:	"Herbert J. Skuhra" <herbert@gojira.at>
This commit is contained in:
Dimitry Andric 2020-12-02 21:39:54 +00:00
parent 9687ef8896
commit c4a1cde95e
8 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/man/man5/src.conf.5
View File

@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$
.Dd September 12, 2020
.Dd December 2, 2020
.Dt SRC.CONF 5
.Os
.Sh NAME
@ -1013,6 +1013,8 @@ tool.
.Pp
This is a default setting on
amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc and powerpc/powerpc64.
.It Va WITH_LLVM_CXXFILT
Install LLVM's llvm-cxxfilt as c++filt, instead of ELF Tool Chain's cxxfilt.
.It Va WITHOUT_LLVM_LIBUNWIND
Set to use GCC's stack unwinder (instead of LLVM's libunwind).
.Pp

1
share/mk/src.opts.mk
View File

@ -200,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \
LIBSOFT \
LINT \
LLVM_ASSERTIONS \
LLVM_CXXFILT \
LOADER_FIREWIRE \
LOADER_FORCE_LE \
LOADER_VERBOSE \

7
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -1728,7 +1728,6 @@ OLD_FILES+=usr/bin/lli
OLD_FILES+=usr/bin/llvm-as
OLD_FILES+=usr/bin/llvm-bcanalyzer
OLD_FILES+=usr/bin/llvm-cxxdump
OLD_FILES+=usr/bin/llvm-cxxfilt
OLD_FILES+=usr/bin/llvm-diff
OLD_FILES+=usr/bin/llvm-dis
OLD_FILES+=usr/bin/llvm-dwarfdump
@ -1752,7 +1751,6 @@ OLD_FILES+=usr/share/man/man1/llc.1.gz
OLD_FILES+=usr/share/man/man1/lli.1.gz
OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1
@ -1769,6 +1767,11 @@ OLD_FILES+=usr/share/man/man1/opt.1.gz
OLD_FILES+=usr/bin/clang-format
.endif
.if ${MK_CLANG_EXTRAS} == no && ${MK_LLVM_CXXFILT} == no
OLD_FILES+=usr/bin/llvm-cxxfilt
OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
.endif
.if ${MK_CPP} == no
OLD_FILES+=usr/bin/cpp
OLD_FILES+=usr/share/man/man1/cpp.1.gz

2
tools/build/options/WITHOUT_LLVM_CXXFILT Normal file
View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt.

2
tools/build/options/WITH_LLVM_CXXFILT Normal file
View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Install LLVM's llvm-cxxfilt as c++filt, instead of ELF Tool Chain's cxxfilt.

2
usr.bin/Makefile
View File

@ -274,7 +274,9 @@ SUBDIR.${MK_TOOLCHAIN}+= ar
SUBDIR.${MK_TOOLCHAIN}+= c89
SUBDIR.${MK_TOOLCHAIN}+= c99
SUBDIR.${MK_TOOLCHAIN}+= ctags
.if ${MK_LLVM_CXXFILT} == "no"
SUBDIR.${MK_TOOLCHAIN}+= cxxfilt
.endif
SUBDIR.${MK_TOOLCHAIN}+= elfcopy
SUBDIR.${MK_TOOLCHAIN}+= file2c
# ARM64TODO gprof does not build

5
usr.bin/clang/Makefile
View File

@ -16,6 +16,10 @@ SUBDIR+= llvm-nm
SUBDIR+= llvm-objdump
SUBDIR+= llvm-symbolizer
.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLVM_CXXFILT} != "no"
SUBDIR+= llvm-cxxfilt
.endif
.if ${MK_CLANG_EXTRAS} != "no"
SUBDIR+= bugpoint
SUBDIR+= llc
@ -23,7 +27,6 @@ SUBDIR+= lli
SUBDIR+= llvm-as
SUBDIR+= llvm-bcanalyzer
SUBDIR+= llvm-cxxdump
SUBDIR+= llvm-cxxfilt
SUBDIR+= llvm-diff
SUBDIR+= llvm-dis
SUBDIR+= llvm-dwarfdump

7
usr.bin/clang/llvm-cxxfilt/Makefile
View File

@ -1,8 +1,15 @@
# $FreeBSD$
.include <src.opts.mk>
PROG_CXX= llvm-cxxfilt
SRCDIR= llvm/tools/llvm-cxxfilt
SRCS+= llvm-cxxfilt.cpp
.if ${MK_LLVM_CXXFILT} != "no"
LINKS= ${BINDIR}/llvm-cxxfilt ${BINDIR}/c++filt
MLINKS= llvm-cxxfilt.1 c++filt.1
.endif
.include "../llvm.prog.mk"