Page MenuHomeFreeBSD
Files F107020252

D42575.diff
No OneTemporary
Actions

D42575.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,10 @@
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20231113:
+ The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled
+ it is always installed as /usr/bin/ld.
+
20231027:
Forward compatibility (running the new code on old kernels) for the
"ino64" project have been removed. The need for it has passed long ago.
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd October 29, 2023
+.Dd November 13, 2023
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -902,13 +902,6 @@
Do not build the LLD linker during the bootstrap phase of
the build.
To be able to build the system an alternate linker must be provided via XLD.
-.It Va WITHOUT_LLD_IS_LD
-Do not install a
-.Pa /usr/bin/ld symlink
-to
-.Pa ld.lld .
-The system will not have a usable tool chain unless a linker is provided
-some other way.
.It Va WITHOUT_LLVM_ASSERTIONS
Disable debugging assertions in LLVM.
.It Va WITH_LLVM_BINUTILS
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -124,7 +124,6 @@
LEGACY_CONSOLE \
LLD \
LLD_BOOTSTRAP \
- LLD_IS_LD \
LLVM_ASSERTIONS \
LLVM_COV \
LLVM_CXXFILT \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -162,11 +162,6 @@
OLD_DIRS+=usr/share/examples/bhyve
.endif
-.if ${MK_LLD_IS_LD} == no
-OLD_FILES+=usr/bin/ld
-OLD_FILES+=usr/share/man/man1/ld.1.gz
-.endif
-
.if ${MK_BLACKLIST} == no
OLD_FILES+=etc/blacklistd.conf
OLD_FILES+=etc/rc.d/blacklistd
diff --git a/tools/build/options/WITHOUT_LLD_IS_LD b/tools/build/options/WITHOUT_LLD_IS_LD
deleted file mode 100644
--- a/tools/build/options/WITHOUT_LLD_IS_LD
+++ /dev/null
@@ -1,6 +0,0 @@
-Do not install a
-.Pa /usr/bin/ld symlink
-to
-.Pa ld.lld .
-The system will not have a usable tool chain unless a linker is provided
-some other way.
diff --git a/tools/build/options/WITH_LLD_IS_LD b/tools/build/options/WITH_LLD_IS_LD
deleted file mode 100644
--- a/tools/build/options/WITH_LLD_IS_LD
+++ /dev/null
@@ -1 +0,0 @@
-Use LLVM's LLD as the system linker.
diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -9,7 +9,7 @@
PROG_CXX= ld.lld
# Man page directory
.PATH: ${LLD_SRCS}/docs
-.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} != "no") || \
+.if !defined(TOOLS_PREFIX) || \
(defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no")
SYMLINKS= ${PROG_CXX} ${BINDIR}/ld
MLINKS= ld.lld.1 ld.1

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 2:02 AM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15738278
Default Alt Text
D42575.diff (2 KB)

Event Timeline