From 6b4e5d6b727140ce20db2e6d1389d7aecfa1792f Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Tue, 5 Nov 2019 03:22:15 +0000
Subject: [PATCH] armv6, armv7: Switch to llvm-libunwind by default

This could just be ${__TT} == "arm", except armv5 isn't slated for death
until EOY.

arm tinderbox builds.  Let's see what else shakes out.
---
 share/mk/src.opts.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 2fecf2463f38..171676dd52d3 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -329,8 +329,9 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif
-.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
-    ${__T:Mriscv*} != "" || ${__TT} == "mips"
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "armv6" || \
+    ${__T} == "armv7" || ${__T} == "i386" || ${__T:Mriscv*} != "" || \
+    ${__TT} == "mips"
 __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
 .else
 __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND