Attachment 181427 Details for Bug 214864 – always enable lld as bootstrap and installed system linker

[patch] always enable lld as bootstrap and installed system linker

pr214864.diff (text/plain), 1.81 KB, created by Ed Maste on 2017-04-03 13:09:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2017-04-03 13:09:15 UTC

Size: 1.81 KB

patch

obsolete

>diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
>index 16c2527de51f..f5fe877b8eb3 100644
>--- a/share/mk/src.opts.mk
>+++ b/share/mk/src.opts.mk
>@@ -123,6 +123,8 @@ __DEFAULT_YES_OPTIONS = \
>     LIB32 \
>     LIBPTHREAD \
>     LIBTHR \
>+    LLD \
>+    LLD_IS_LD \
>     LOCALES \
>     LOCATE \
>     LPR \
>@@ -221,18 +223,18 @@ __TT=${MACHINE}
> .if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \
>     ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
> # Clang is enabled, and will be installed as the default /usr/bin/cc.
>-__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD
>+__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
> __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
> .elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64"
> # If an external compiler that supports C++11 is used as ${CC} and Clang
> # supports the target, then Clang is enabled but GCC is installed as the
> # default /usr/bin/cc.
> __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
>-__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD
>+__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
> .else
> # Everything else disables Clang, and uses GCC instead.
> __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
>-__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD
>+__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
> .endif
> # In-tree binutils/gcc are older versions without modern architecture support.
> .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
>@@ -249,11 +251,6 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
> .else
> __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
> .endif
>-.if ${__T} == "aarch64"
>-__DEFAULT_YES_OPTIONS+=LLD_IS_LD
>-.else
>-__DEFAULT_NO_OPTIONS+=LLD_IS_LD
>-.endif
> .if ${__T} == "aarch64" || ${__T} == "amd64"
> __DEFAULT_YES_OPTIONS+=LLDB
> .else

Actions: View | Diff

Attachments on bug 214864: 177426 | 181427 | 185533 | 185682 | 185684 | 185976 | 186042 | 186060 | 193869 | 195636 | 195726 | 197173 | 199581 | 200892