svn commit: r355646 - head/share/mk

[Conrad Meyer]

Author: cem
Date: Thu Dec 12 04:47:02 2019
New Revision: 355646
URL: https://svnweb.freebsd.org/changeset/base/355646

Log:
  Revert r354348
  
  Switch ARM32 default libunwind back to old GPL2 libgcc version.  Reportedly,
  the llvm-libunwind code is nonfunctional.
  
  Requested by:	mmel

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Thu Dec 12 04:44:09 2019	(r355645)
+++ head/share/mk/src.opts.mk	Thu Dec 12 04:47:02 2019	(r355646)
@@ -327,9 +327,8 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BO
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
-.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "armv6" || \
-    ${__T} == "armv7" || ${__T} == "i386" || ${__T:Mriscv*} != "" || \
-    ${__TT} == "mips"
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
+    ${__T:Mriscv*} != "" || ${__TT} == "mips"
 __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
 .else
 __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND