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

retire the LLVM_LIBUNWIND option

Browse Source 
LLVM's libunwind is used on all FreeBSD-supported CPU architectures and
is a required component.

Reviewed by:	brooks (earlier)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D23123
This commit is contained in:
Ed Maste 2020-02-29 12:43:43 +00:00
parent a9854bc381
commit c45018041d
12 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -2747,7 +2747,7 @@ _prereq_libs+= lib/libssp_nonshared
# These dependencies are not automatically generated:
#
# gnu/lib/libgcc, lib/csu and lib/libc must be built before
# lib/csu and lib/libc must be built before
# all shared libraries for ELF.
#
_startup_libs= lib/csu
@ -2757,7 +2757,6 @@ _startup_libs+= lib/libc_nonshared
_startup_libs+= lib/libcxxrt
.endif
.if ${MK_LLVM_LIBUNWIND} != "no"
_prereq_libs+= lib/libgcc_eh lib/libgcc_s
_startup_libs+= lib/libgcc_eh lib/libgcc_s
@ -2766,7 +2765,6 @@ lib/libgcc_s__L: lib/libc_nonshared__L
.if ${MK_LIBCPLUSPLUS} != "no"
lib/libcxxrt__L: lib/libgcc_s__L
.endif
.endif
_prebuild_libs= ${_kerberos5_lib_libasn1} \
${_kerberos5_lib_libhdb} \

4
UPDATING
View File

@ -26,6 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20200229:
The WITHOUT_LLVM_LIBUNWIND option has been removed. LLVM's libunwind
is used by all supported CPU architectures.
20200229:
GCC 4.2.1 has been removed from the tree. The WITH_GCC,
WITH_GCC_BOOTSTRAP, and WITH_GNUCXX options are no longer available.

1
contrib/bmake/mk/meta2deps.sh
View File

@ -49,7 +49,6 @@
# The output, is a set of absolute paths with "SB" like:
#.nf
#
# $SB/obj-i386/bsd/gnu/lib/libgcc
# $SB/obj-i386/bsd/include
# $SB/obj-i386/bsd/lib/csu/i386
# $SB/obj-i386/bsd/lib/libc

4
lib/Makefile
View File

@ -53,6 +53,8 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libexpat \
libfetch \
libfigpar \
libgcc_eh \
libgcc_s \
libgeom \
libifconfig \
libipsec \
@ -177,8 +179,6 @@ _libcplusplus+= libc++experimental
SUBDIR.${MK_EFI}+= libefivar
SUBDIR.${MK_GOOGLETEST}+= googletest
SUBDIR.${MK_LIBTHR}+= libthr
SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_eh
SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_s
SUBDIR.${MK_NETGRAPH}+= libnetgraph
SUBDIR.${MK_NIS}+= libypclnt

4
share/mk/local.dirdeps.mk
View File

@ -91,13 +91,9 @@ DIRDEPS += \
# Add both gcc_s and gcc_eh as dependencies as the decision to build
# -static or not is not known here.
.if ${DEP_RELDIR:M*libgcc*} == "" && ${DIRDEPS:U:Mlib/libc} != ""
.if ${MK_LLVM_LIBUNWIND} == "yes"
DIRDEPS+= \
lib/libgcc_eh \
lib/libgcc_s
.else
DIRDEPS+= gnu/lib/libgcc
.endif
.endif
# Bootstrap support. Give hints to DIRDEPS if there is no Makefile.depend*

1
share/mk/local.gendirdeps.mk
View File

@ -10,7 +10,6 @@ GENDIRDEPS_FILTER+= \
Nlib/libssp_nonshared \
Ncddl/usr.bin/ctf* \
Nlib/libc_nonshared \
Ngnu/lib/libgcc \
Nlib/libgcc_eh \
Nlib/libgcc_s \
Nstand/libsa/* \

1
share/mk/meta2deps.sh
View File

@ -49,7 +49,6 @@
# The output, is a set of absolute paths with "SB" like:
#.nf
#
# $SB/obj-i386/bsd/gnu/lib/libgcc
# $SB/obj-i386/bsd/include
# $SB/obj-i386/bsd/lib/csu/i386
# $SB/obj-i386/bsd/lib/libc

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

@ -127,7 +127,6 @@ __DEFAULT_YES_OPTIONS = \
LIBPTHREAD \
LIBTHR \
LLVM_COV \
LLVM_LIBUNWIND \
LLVM_TARGET_ALL \
LOADER_GELI \
LOADER_LUA \
@ -423,7 +422,6 @@ MK_${var}:= no
#
.if !${COMPILER_FEATURES:Mc++11}
MK_GOOGLETEST:= no
MK_LLVM_LIBUNWIND:= no
.endif
.if ${MK_CAPSICUM} == "no"

3
targets/pseudo/userland/gnu/Makefile.depend
View File

@ -37,7 +37,4 @@ DIRDEPS = \
DIRDEPS+= gnu/usr.bin/dtc
.endif
.if ${MK_LLVM_LIBUNWIND} == "no"
.endif
.include <dirdeps.mk>

2
targets/pseudo/userland/lib/Makefile.depend
View File

@ -237,11 +237,9 @@ DIRDEPS+= lib/libgpio
DIRDEPS+= lib/libefivar
.endif
.if ${MK_LLVM_LIBUNWIND} != "no"
DIRDEPS+= \
lib/libgcc_eh \
lib/libgcc_s
.endif
.if ${MK_PMC} != "no"
DIRDEPS+= \

2
tools/build/options/WITHOUT_LLVM_LIBUNWIND
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Set to use GCC's stack unwinder (instead of LLVM's libunwind).

2
tools/build/options/WITH_LLVM_LIBUNWIND
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder).