Date: Sat, 29 Feb 2020 12:43:43 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358460 - in head: . contrib/bmake/mk lib share/mk targets/pseudo/userland/gnu targets/pseudo/userland/lib tools/build/options Message-ID: <202002291243.01TChhlc029191@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sat Feb 29 12:43:43 2020 New Revision: 358460 URL: https://svnweb.freebsd.org/changeset/base/358460 Log: retire the LLVM_LIBUNWIND option 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 Deleted: head/tools/build/options/WITHOUT_LLVM_LIBUNWIND head/tools/build/options/WITH_LLVM_LIBUNWIND Modified: head/Makefile.inc1 head/UPDATING head/contrib/bmake/mk/meta2deps.sh head/lib/Makefile head/share/mk/local.dirdeps.mk head/share/mk/local.gendirdeps.mk head/share/mk/meta2deps.sh head/share/mk/src.opts.mk head/targets/pseudo/userland/gnu/Makefile.depend head/targets/pseudo/userland/lib/Makefile.depend Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Feb 29 12:40:27 2020 (r358459) +++ head/Makefile.inc1 Sat Feb 29 12:43:43 2020 (r358460) @@ -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 @@ -2765,7 +2764,6 @@ lib/libgcc_s__L: lib/libc__L 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} \ Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Feb 29 12:40:27 2020 (r358459) +++ head/UPDATING Sat Feb 29 12:43:43 2020 (r358460) @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: "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. Users who wish to build FreeBSD with GCC must use the external toolchain Modified: head/contrib/bmake/mk/meta2deps.sh ============================================================================== --- head/contrib/bmake/mk/meta2deps.sh Sat Feb 29 12:40:27 2020 (r358459) +++ head/contrib/bmake/mk/meta2deps.sh Sat Feb 29 12:43:43 2020 (r358460) @@ -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 Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sat Feb 29 12:40:27 2020 (r358459) +++ head/lib/Makefile Sat Feb 29 12:43:43 2020 (r358460) @@ -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 Modified: head/share/mk/local.dirdeps.mk ============================================================================== --- head/share/mk/local.dirdeps.mk Sat Feb 29 12:40:27 2020 (r358459) +++ head/share/mk/local.dirdeps.mk Sat Feb 29 12:43:43 2020 (r358460) @@ -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* Modified: head/share/mk/local.gendirdeps.mk ============================================================================== --- head/share/mk/local.gendirdeps.mk Sat Feb 29 12:40:27 2020 (r358459) +++ head/share/mk/local.gendirdeps.mk Sat Feb 29 12:43:43 2020 (r358460) @@ -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/* \ Modified: head/share/mk/meta2deps.sh ============================================================================== --- head/share/mk/meta2deps.sh Sat Feb 29 12:40:27 2020 (r358459) +++ head/share/mk/meta2deps.sh Sat Feb 29 12:43:43 2020 (r358460) @@ -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 Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sat Feb 29 12:40:27 2020 (r358459) +++ head/share/mk/src.opts.mk Sat Feb 29 12:43:43 2020 (r358460) @@ -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" Modified: head/targets/pseudo/userland/gnu/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/gnu/Makefile.depend Sat Feb 29 12:40:27 2020 (r358459) +++ head/targets/pseudo/userland/gnu/Makefile.depend Sat Feb 29 12:43:43 2020 (r358460) @@ -37,7 +37,4 @@ DIRDEPS = \ DIRDEPS+= gnu/usr.bin/dtc .endif -.if ${MK_LLVM_LIBUNWIND} == "no" -.endif - .include <dirdeps.mk> Modified: head/targets/pseudo/userland/lib/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/lib/Makefile.depend Sat Feb 29 12:40:27 2020 (r358459) +++ head/targets/pseudo/userland/lib/Makefile.depend Sat Feb 29 12:43:43 2020 (r358460) @@ -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+= \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002291243.01TChhlc029191>