Page MenuHomeFreeBSD
Files F148110059

D23107.diff
No OneTemporary
Actions

D23107.diff
View Options

Index: head/gnu/usr.bin/binutils/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/Makefile
+++ head/gnu/usr.bin/binutils/Makefile
@@ -11,11 +11,9 @@
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
Index: head/tools/build/options/WITHOUT_BINUTILS
===================================================================
--- head/tools/build/options/WITHOUT_BINUTILS
+++ head/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.
Index: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
===================================================================
--- head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
+++ head/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
Index: head/tools/build/options/WITH_BINUTILS
===================================================================
--- head/tools/build/options/WITH_BINUTILS
+++ head/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.
Index: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP
===================================================================
--- head/tools/build/options/WITH_BINUTILS_BOOTSTRAP
+++ head/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.

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 8:37 PM (11 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29786461
Default Alt Text
D23107.diff (2 KB)

Event Timeline