svn commit: r356319 - head/share/mk

[Ed Maste]

Author: emaste
Date: Fri Jan  3 16:06:41 2020
New Revision: 356319
URL: https://svnweb.freebsd.org/changeset/base/356319

Log:
  src.opts.mk: simplify after arm/arm retirement
  
  There were a few special cases for arm v5, such as disabling LLDB due to
  the lack of 64-bit atomic operations.  Now that arm has been retired (as
  of r356263) we can simplify the options logic somewhat.

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Jan  3 15:29:32 2020	(r356318)
+++ head/share/mk/src.opts.mk	Fri Jan  3 16:06:41 2020	(r356319)
@@ -285,10 +285,6 @@ __LLVM_TARGET_FILT=	C/(amd64|i386)/x86/:S/sparc64/spar
 # Default enable the given TARGET's LLVM_TARGET support
 .if ${__TT:${__LLVM_TARGET_FILT}} == ${__llt}
 __DEFAULT_YES_OPTIONS+=	LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}
-# Disable other targets for arm, to work around "relocation truncated
-# to fit" errors with BFD ld, since libllvm.a will get too large to link.
-.elif ${__T} == "arm"
-__DEFAULT_NO_OPTIONS+=LLVM_TARGET_${__llt:tu}
 # aarch64 needs arm for -m32 support.
 .elif ${__TT} == "arm64" && ${__llt} == "arm"
 __DEFAULT_DEPENDENT_OPTIONS+=	LLVM_TARGET_ARM/LLVM_TARGET_AARCH64
@@ -328,8 +324,7 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BO
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
-.if ${__T} != "arm" && ${__T} != "armv6" && ${__T} != "armv7" && \
-    ${__T} != "sparc64"
+.if ${__T} != "armv6" && ${__T} != "armv7" && ${__T} != "sparc64"
 __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
 .else
 __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
@@ -344,10 +339,6 @@ __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
 __DEFAULT_YES_OPTIONS+=LLDB
 .else
 __DEFAULT_NO_OPTIONS+=LLDB
-.endif
-# LLVM lacks support for FreeBSD 64-bit atomic operations for ARMv4/ARMv5
-.if ${__T} == "arm"
-BROKEN_OPTIONS+=LLDB
 .endif
 # GDB in base is generally less functional than GDB in ports.  Ports GDB
 # sparc64 kernel support has not been tested.