Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F132578051
D10249.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D10249.id.diff
View Options
Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -171,7 +171,7 @@
# riscv64-binutils port or package.
.if !make(showconfig)
.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
- ${MK_LLD_IS_LD} == "no" && \
+ ${MK_LLD_BOOTSTRAP} == "no" && \
!defined(CROSS_BINUTILS_PREFIX)
CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
.if !exists(${CROSS_BINUTILS_PREFIX})
@@ -1665,9 +1665,10 @@
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
-# We need to build tblgen when we're building clang either as
-# the bootstrap compiler, or as the part of the normal build.
-.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
+# We need to build tblgen when we're building clang or lld, either as
+# bootstrap tools, or as the part of the normal build.
+.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \
+ ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no"
_clang_tblgen= \
lib/clang/libllvmminimal \
usr.bin/clang/llvm-tblgen \
@@ -1828,9 +1829,6 @@
# cross-build on a FreeBSD 10 host:
_elftctools+= usr.bin/addr2line
.endif
-.if ${MK_LLD_IS_LD} != "no"
-_lld= usr.bin/clang/lld
-.endif
.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
# If cross-building with an external binutils we still need to build strip for
# the target (for at least crunchide).
@@ -1841,6 +1839,11 @@
.if ${MK_CLANG_BOOTSTRAP} != "no"
_clang= usr.bin/clang
+.endif
+.if ${MK_LLD_BOOTSTRAP} != "no"
+_lld= usr.bin/clang/lld
+.endif
+.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no"
_clang_libs= lib/clang
.endif
.if ${MK_GCC_BOOTSTRAP} != "no"
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -250,9 +250,9 @@
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
.endif
.if ${__T} == "aarch64"
-__DEFAULT_YES_OPTIONS+=LLD_IS_LD
+__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.else
-__DEFAULT_NO_OPTIONS+=LLD_IS_LD
+__DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.endif
.if ${__T} == "aarch64" || ${__T} == "amd64"
__DEFAULT_YES_OPTIONS+=LLDB
Index: head/tools/build/options/WITHOUT_LLD_BOOTSTRAP
===================================================================
--- head/tools/build/options/WITHOUT_LLD_BOOTSTRAP
+++ head/tools/build/options/WITHOUT_LLD_BOOTSTRAP
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build the LLD linker during the bootstrap phase of
+the build.
+To be able to build the system, either Binutils or LLD bootstrap must be
+enabled unless an alternate linker is provided via XLD.
Index: head/tools/build/options/WITH_LLD_BOOTSTRAP
===================================================================
--- head/tools/build/options/WITH_LLD_BOOTSTRAP
+++ head/tools/build/options/WITH_LLD_BOOTSTRAP
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build the LLD linker during the bootstrap phase of the build.
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Oct 19, 3:17 AM (9 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23907705
Default Alt Text
D10249.id.diff (2 KB)
Attached To
Mode
D10249: Introduce LLD_BOOTSTRAP to control lld as bootstrap linker
Attached
Detach File
Event Timeline
Log In to Comment