From 797f722f5facd5ea19ef5ad1418b71bed8cb27d7 Mon Sep 17 00:00:00 2001
From: sergesanspaille <sguelton@redhat.com>
Date: Tue, 10 Dec 2019 13:33:59 +0000
Subject: [PATCH] Activate -funwind-tables on all arches, see rhbz#1655546

---
 ...ind-tables-the-default-for-all-archs.patch | 39 +++++++++++++++++++
 clang.spec                                    |  6 ++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 0001-Make-funwind-tables-the-default-for-all-archs.patch

diff --git a/0001-Make-funwind-tables-the-default-for-all-archs.patch b/0001-Make-funwind-tables-the-default-for-all-archs.patch
new file mode 100644
index 0000000..d9e9125
--- /dev/null
+++ b/0001-Make-funwind-tables-the-default-for-all-archs.patch
@@ -0,0 +1,39 @@
+From 690373af5a5d50cf115ed6e4d2849bb786f9dc8e Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton@redhat.com>
+Date: Tue, 10 Dec 2019 09:18:03 +0000
+Subject: [PATCH] Make -funwind-tables the default for all archs
+
+---
+ clang/lib/Driver/ToolChain.cpp      | 2 +-
+ clang/lib/Driver/ToolChains/Gnu.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
+index b1fddb0af55..43af40ed0e8 100644
+--- a/clang/lib/Driver/ToolChain.cpp
++++ b/clang/lib/Driver/ToolChain.cpp
+@@ -244,7 +244,7 @@ std::string ToolChain::getInputFilename(const InputInfo &Input) const {
+ }
+ 
+ bool ToolChain::IsUnwindTablesDefault(const ArgList &Args) const {
+-  return false;
++  return true;
+ }
+ 
+ Tool *ToolChain::getClang() const {
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index 33cdd3585c2..15e82be8f3a 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2535,7 +2535,7 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
+ }
+ 
+ bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
+-  return getArch() == llvm::Triple::x86_64;
++  return true;
+ }
+ 
+ bool Generic_GCC::isPICDefault() const {
+-- 
+2.20.1
+
diff --git a/clang.spec b/clang.spec
index acd083c..4035ed3 100644
--- a/clang.spec
+++ b/clang.spec
@@ -4,7 +4,7 @@
 %global min_ver 0
 %global patch_ver 0
 #%%global rc_ver 3
-%global baserelease 1
+%global baserelease 2
 
 %global clang_tools_binaries \
 	%{_bindir}/clangd \
@@ -83,6 +83,7 @@ Patch4:		0002-gtest-reorg.patch
 Patch9:		0001-Fix-uninitialized-value-in-ABIArgInfo.patch
 Patch11:	0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
 Patch12:	0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
+Patch13:	0001-Make-funwind-tables-the-default-for-all-archs.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -441,6 +442,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \
 
 %endif
 %changelog
+* Tue Dec 10 2019 sguelton@redhat.com - 9.0.0-2
+- Activate -funwind-tables on all arches, see rhbz#1655546.
+
 * Thu Sep 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
 - 9.0.0 Release