svn commit: r327910 - in head/share: man/man5 mk

[Ed Maste]

Author: emaste
Date: Sat Jan 13 04:00:55 2018
New Revision: 327910
URL: https://svnweb.freebsd.org/changeset/base/327910

Log:
  Revert r327823, Enable ld.lld as bootstrap linker by default on i386
  
  There's a report of some regression in ports.  Revert for now for an
  exp run for this change in isolation (previous lld exp run also included
  switching the linker used for ports to lld).
  
  Also revert the src.conf.5 regeneration in r327824.
  
  Reported by:	antoine
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/man/man5/src.conf.5
  head/share/mk/src.opts.mk

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Sat Jan 13 03:12:21 2018	(r327909)
+++ head/share/man/man5/src.conf.5	Sat Jan 13 04:00:55 2018	(r327910)
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd January 11, 2018
+.Dd January 12, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -970,12 +970,12 @@ To be able to build the system, either Binutils or LLD
 enabled unless an alternate linker is provided via XLD.
 .Pp
 This is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
 .It Va WITH_LLD_BOOTSTRAP
 Set to build the LLD linker during the bootstrap phase of the build.
 .Pp
 This is a default setting on
-amd64/amd64, arm64/aarch64 and i386/i386.
+amd64/amd64 and arm64/aarch64.
 .It Va WITHOUT_LLD_IS_LD
 Set to use GNU binutils ld as the system linker, instead of LLVM's LLD.
 .Pp

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat Jan 13 03:12:21 2018	(r327909)
+++ head/share/mk/src.opts.mk	Sat Jan 13 04:00:55 2018	(r327910)
@@ -253,7 +253,7 @@ __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
 .endif
 .if ${__T} == "aarch64"
 __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
-.elif ${__T} == "amd64" || ${__T} == "i386"
+.elif ${__T} == "amd64"
 __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP
 __DEFAULT_NO_OPTIONS+=LLD_IS_LD
 .else