svn commit: r355095 - head/share/mk

Ed Maste emaste at FreeBSD.org
Mon Nov 25 18:18:29 UTC 2019


Author: emaste
Date: Mon Nov 25 18:18:28 2019
New Revision: 355095
URL: https://svnweb.freebsd.org/changeset/base/355095

Log:
  remove armv6 LLVM workaround introduced in r341812
  
  r341812 enabled only arm target support in LLVM on arm and armv6,
  because ld.bfd 2.17.50 lacked support for range extensions required for
  linking such large binaries/libraries.  r341812 indicated that the
  workaround should be removed once the userland can be linked by lld.
  
  r354289 switched armv6 to use lld by default, so remove the workaround
  on armv6.  The workaround remains in place for arm (v5), and will
  presumably be removed when arm is retired.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Mon Nov 25 16:46:41 2019	(r355094)
+++ head/share/mk/src.opts.mk	Mon Nov 25 18:18:28 2019	(r355095)
@@ -286,7 +286,7 @@ __LLVM_TARGET_FILT=	C/(amd64|i386)/x86/:S/sparc64/spar
 __DEFAULT_DEPENDENT_OPTIONS+=	LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/CLANG
 # Disable other targets for arm and armv6, to work around "relocation truncated
 # to fit" errors with BFD ld, since libllvm.a will get too large to link.
-.elif ${__T} == "arm" || ${__T} == "armv6"
+.elif ${__T} == "arm"
 __DEFAULT_NO_OPTIONS+=LLVM_TARGET_${__llt:tu}
 # aarch64 needs arm for -m32 support.
 .elif ${__TT} == "arm64" && ${__llt} == "arm"


More information about the svn-src-head mailing list