From 5fa85bcd67294793fbddd8b4ab1e934803999bc9 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Thu, 12 Dec 2019 04:47:02 +0000
Subject: [PATCH] Revert r354348

Switch ARM32 default libunwind back to old GPL2 libgcc version.  Reportedly,
the llvm-libunwind code is nonfunctional.

Requested by:	mmel
---
 share/mk/src.opts.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 8a9892022958..6753b8cb8d6f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -327,9 +327,8 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB
 .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