From d3a549991a2b65789f7cd1ace1bda3e0614f017b Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 27 Dec 2019 16:28:43 +0000 Subject: [PATCH] src.opts.mk: switch LLVM_LIBUNWIND to opt-out PowerPC switched to LLVM_LIBUNWIND along with the switch to Clang/LLVM in r356111. This leaves only 32-bit Arm and sparc64 not using LLVM's unwinder, so switch the sense to opt-out. I elected to list the individual arm MACHINE_ARCHs so future changes are more clear if LLVM_LIBUNWIND is enabled for one or two but not all 32-bit Arm targets (see PR 233664). --- share/mk/src.opts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index a5bc2707e02..b6cba1e6422 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -327,8 +327,8 @@ BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED .endif -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \ - ${__TT} == "powerpc" || ${__T:Mriscv*} != "" || ${__TT} == "mips" +.if ${__T} != "arm" && ${__T} != "armv6" && ${__T} != "armv7" && \ + ${__T} != "sparc64" __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND .else __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND -- 2.45.0