summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-01-14 17:56:54 +0000
committerEd Maste <emaste@FreeBSD.org>2020-01-14 17:56:54 +0000
commit1e1c6bb49fc188b466d5fcacd7fbf4036d20a827 (patch)
tree3909b311431815326c0124260a2e324fc0917330
parent4b50c451720d8b427757a6da1dd2bb4c52cd9e35 (diff)
Notes
-rw-r--r--gnu/usr.bin/binutils/Makefile8
-rw-r--r--tools/build/options/WITHOUT_BINUTILS2
-rw-r--r--tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP2
-rw-r--r--tools/build/options/WITH_BINUTILS2
-rw-r--r--tools/build/options/WITH_BINUTILS_BOOTSTRAP2
5 files changed, 7 insertions, 9 deletions
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 5493e2f12681f..6d0ef550caf8f 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -11,11 +11,9 @@ SUBDIR.${MK_BINUTILS}+= libbinutils
SUBDIR.${MK_BINUTILS}+= as
SUBDIR.${MK_BINUTILS}+= objdump
-# When we use ld.lld as /usr/bin/ld, do not install the non-ifunc-capable
-# GNU binutils 2.17.50 ld.
-# Except if we are on powerpc, that needs the ld from binutils to link
-# 32-bit binaries.
-.if ${MK_LLD_IS_LD} == "no" || ${TARGET} == "powerpc"
+# All archs except powerpc either use lld or require external toolchain.
+# powerpc still needs binutils ld to link 32-bit binaries.
+.if ${TARGET} == "powerpc"
SUBDIR.${MK_BINUTILS}+=ld
.endif
diff --git a/tools/build/options/WITHOUT_BINUTILS b/tools/build/options/WITHOUT_BINUTILS
index 2dee78d043808..8eea45e634866 100644
--- a/tools/build/options/WITHOUT_BINUTILS
+++ b/tools/build/options/WITHOUT_BINUTILS
@@ -2,7 +2,7 @@
Set to not build or install GNU
.Xr as 1 ,
.Xr objdump 1 ,
-and for some CPU architectures
+and, on powerpc,
.Xr ld.bfd 1
as part
of the normal system build.
diff --git a/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP b/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
index 6d1ef1330633e..57fa6bc095fd8 100644
--- a/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
+++ b/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
@@ -1,5 +1,5 @@
.\" $FreeBSD$
-Set to not build binutils (as, ld, and objdump)
+Set to not build binutils (as, objdump, and on powerpc ld)
as part of the bootstrap process.
.Bf -symbolic
The option does not work for build targets unless some alternative
diff --git a/tools/build/options/WITH_BINUTILS b/tools/build/options/WITH_BINUTILS
index 5f9d98d7fcaf0..e4dc9c3e34f76 100644
--- a/tools/build/options/WITH_BINUTILS
+++ b/tools/build/options/WITH_BINUTILS
@@ -2,7 +2,7 @@
Set to build and install GNU
.Xr as 1 ,
.Xr objdump 1 ,
-and for some CPU architectures
+and, on powerpc,
.Xr ld.bfd 1
as part
of the normal system build.
diff --git a/tools/build/options/WITH_BINUTILS_BOOTSTRAP b/tools/build/options/WITH_BINUTILS_BOOTSTRAP
index 0073a0582d428..1f938d9c5e9ed 100644
--- a/tools/build/options/WITH_BINUTILS_BOOTSTRAP
+++ b/tools/build/options/WITH_BINUTILS_BOOTSTRAP
@@ -1,3 +1,3 @@
.\" $FreeBSD$
-Set build binutils (as, ld, and objdump)
+Set build binutils (as, objdump, and on powerpc ld)
as part of the bootstrap process.