Skip to content

Commit

Permalink
limit ld.bfd to powerpc
Browse files Browse the repository at this point in the history
All archs except powerpc either use lld or require external toolchain.
powerpc still needs binutils ld to link 32-bit binaries.

Reviewed by:	jhibbits
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D23107
  • Loading branch information
emaste committed Jan 14, 2020
1 parent 4b50c45 commit 1e1c6bb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
8 changes: 3 additions & 5 deletions gnu/usr.bin/binutils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/build/options/WITHOUT_BINUTILS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/build/options/WITH_BINUTILS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion tools/build/options/WITH_BINUTILS_BOOTSTRAP
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 1e1c6bb

Please sign in to comment.