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

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

Browse Source 
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 after:	2 weeks
This commit is contained in:
dim 2020-11-03 19:57:28 +00:00
parent 3379d69044
commit a8b9895872
7 changed files with 21 additions and 2 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. .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$ .\" $FreeBSD$
.Dd September 15, 2020 .Dd November 3, 2020
.Dt SRC.CONF 5 .Dt SRC.CONF 5
.Os .Os
.Sh NAME .Sh NAME
@ -919,6 +919,8 @@ Set to disable debugging assertions in LLVM.
Set to not build the Set to not build the
.Xr llvm-cov 1 .Xr llvm-cov 1
tool. tool.
.It Va WITH_LLVM_CXXFILT
Install LLVM's llvm-cxxfilt as c++filt, instead of ELF Tool Chain's cxxfilt.
.It Va WITHOUT_LLVM_TARGET_AARCH64 .It Va WITHOUT_LLVM_TARGET_AARCH64
Set to not build LLVM target support for AArch64. Set to not build LLVM target support for AArch64.
The The

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

@ -210,6 +210,7 @@ __DEFAULT_NO_OPTIONS = \
GNU_GREP_COMPAT \ GNU_GREP_COMPAT \
HESIOD \ HESIOD \
LIBSOFT \ LIBSOFT \
LLVM_CXXFILT \
LOADER_FIREWIRE \ LOADER_FIREWIRE \
LOADER_VERBOSE \ LOADER_VERBOSE \
LOADER_VERIEXEC_PASS_MANIFEST \ LOADER_VERIEXEC_PASS_MANIFEST \

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

@ -260,7 +260,9 @@ SUBDIR.${MK_TOOLCHAIN}+= ar
SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c89
SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= c99
SUBDIR.${MK_TOOLCHAIN}+= ctags SUBDIR.${MK_TOOLCHAIN}+= ctags
.if ${MK_LLVM_CXXFILT} == "no"
SUBDIR.${MK_TOOLCHAIN}+= cxxfilt SUBDIR.${MK_TOOLCHAIN}+= cxxfilt
.endif
SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= objcopy
SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= file2c
SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= gprof

5
usr.bin/clang/Makefile
View File

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

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

@ -1,8 +1,15 @@
# $FreeBSD$ # $FreeBSD$
.include <src.opts.mk>
PROG_CXX= llvm-cxxfilt PROG_CXX= llvm-cxxfilt
SRCDIR= llvm/tools/llvm-cxxfilt SRCDIR= llvm/tools/llvm-cxxfilt
SRCS+= llvm-cxxfilt.cpp 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" .include "../llvm.prog.mk"