Skip to content

Commit

Permalink
retire the LLVM_LIBUNWIND option
Browse files Browse the repository at this point in the history
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
  • Loading branch information
emaste committed Feb 29, 2020
1 parent a9854bc commit c450180
Show file tree
Hide file tree
Showing 12 changed files with 7 additions and 23 deletions.
4 changes: 1 addition & 3 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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} \
Expand Down
4 changes: 4 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion contrib/bmake/mk/meta2deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libexpat \
libfetch \
libfigpar \
libgcc_eh \
libgcc_s \
libgeom \
libifconfig \
libipsec \
Expand Down Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions share/mk/local.dirdeps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
1 change: 0 additions & 1 deletion share/mk/local.gendirdeps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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/* \
Expand Down
1 change: 0 additions & 1 deletion share/mk/meta2deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions share/mk/src.opts.mk
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ __DEFAULT_YES_OPTIONS = \
LIBPTHREAD \
LIBTHR \
LLVM_COV \
LLVM_LIBUNWIND \
LLVM_TARGET_ALL \
LOADER_GELI \
LOADER_LUA \
Expand Down Expand Up @@ -423,7 +422,6 @@ MK_${var}:= no
#
.if !${COMPILER_FEATURES:Mc++11}
MK_GOOGLETEST:= no
MK_LLVM_LIBUNWIND:= no
.endif

.if ${MK_CAPSICUM} == "no"
Expand Down
3 changes: 0 additions & 3 deletions targets/pseudo/userland/gnu/Makefile.depend
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,4 @@ DIRDEPS = \
DIRDEPS+= gnu/usr.bin/dtc
.endif

.if ${MK_LLVM_LIBUNWIND} == "no"
.endif

.include <dirdeps.mk>
2 changes: 0 additions & 2 deletions targets/pseudo/userland/lib/Makefile.depend
Original file line number Diff line number Diff line change
Expand Up @@ -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+= \
Expand Down
2 changes: 0 additions & 2 deletions tools/build/options/WITHOUT_LLVM_LIBUNWIND

This file was deleted.

2 changes: 0 additions & 2 deletions tools/build/options/WITH_LLVM_LIBUNWIND

This file was deleted.

0 comments on commit c450180

Please sign in to comment.