svn commit: r356736 - in head: gnu/usr.bin/binutils tools/build/options

[Ed Maste]

Author: emaste
Date: Tue Jan 14 17:56:54 2020
New Revision: 356736
URL: https://svnweb.freebsd.org/changeset/base/356736

Log:
  limit ld.bfd to powerpc
  
  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

Modified:
  head/gnu/usr.bin/binutils/Makefile
  head/tools/build/options/WITHOUT_BINUTILS
  head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
  head/tools/build/options/WITH_BINUTILS
  head/tools/build/options/WITH_BINUTILS_BOOTSTRAP

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile	Tue Jan 14 17:50:13 2020	(r356735)
+++ head/gnu/usr.bin/binutils/Makefile	Tue Jan 14 17:56:54 2020	(r356736)
@@ -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
 

Modified: head/tools/build/options/WITHOUT_BINUTILS
==============================================================================
--- head/tools/build/options/WITHOUT_BINUTILS	Tue Jan 14 17:50:13 2020	(r356735)
+++ head/tools/build/options/WITHOUT_BINUTILS	Tue Jan 14 17:56:54 2020	(r356736)
@@ -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.

Modified: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
==============================================================================
--- head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP	Tue Jan 14 17:50:13 2020	(r356735)
+++ head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP	Tue Jan 14 17:56:54 2020	(r356736)
@@ -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

Modified: head/tools/build/options/WITH_BINUTILS
==============================================================================
--- head/tools/build/options/WITH_BINUTILS	Tue Jan 14 17:50:13 2020	(r356735)
+++ head/tools/build/options/WITH_BINUTILS	Tue Jan 14 17:56:54 2020	(r356736)
@@ -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.

Modified: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP
==============================================================================
--- head/tools/build/options/WITH_BINUTILS_BOOTSTRAP	Tue Jan 14 17:50:13 2020	(r356735)
+++ head/tools/build/options/WITH_BINUTILS_BOOTSTRAP	Tue Jan 14 17:56:54 2020	(r356736)
@@ -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.