1.6.2

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

libunwind-1.3.1-multilib-fix.patch

@@ -0,0 +1,22 @@
+diff -up libunwind-1.3.1/include/libunwind.h.in.multilibfix libunwind-1.3.1/include/libunwind.h.in
+--- libunwind-1.3.1/include/libunwind.h.in.multilibfix	2020-08-13 10:06:03.275601460 -0400
++++ libunwind-1.3.1/include/libunwind.h.in	2020-08-13 10:06:29.579522623 -0400
+@@ -1,8 +1,6 @@
+ /* Provide a real file - not a symlink - as it would cause multiarch conflicts
+    when multiple different arch releases are installed simultaneously.  */
+ 
+-#ifndef UNW_REMOTE_ONLY
+-
+ #if defined __aarch64__
+ #include "libunwind-aarch64.h"
+ #elif defined __arm__
+@@ -28,9 +26,3 @@
+ #else
+ # error "Unsupported arch"
+ #endif
+-
+-#else /* UNW_REMOTE_ONLY */
+-
+-# include "libunwind-@arch@.h"
+-
+-#endif /* UNW_REMOTE_ONLY */

libunwind-arm-default-to-exidx.patch

@@ -1,15 +1,15 @@
-diff -up libunwind-1.1/src/arm/Gglobal.c.default-to-exidx libunwind-1.1/src/arm/Gglobal.c
+diff -up libunwind-1.6.2/src/arm/Gglobal.c.default-to-exidx libunwind-1.6.2/src/arm/Gglobal.c
---- libunwind-1.1/src/arm/Gglobal.c.default-to-exidx	2015-06-02 10:38:39.733587918 -0400
+--- libunwind-1.6.2/src/arm/Gglobal.c.default-to-exidx	2021-12-20 12:06:56.067313075 -0500
-+++ libunwind-1.1/src/arm/Gglobal.c	2015-06-02 10:38:53.086500142 -0400
++++ libunwind-1.6.2/src/arm/Gglobal.c	2021-12-20 12:08:43.063060309 -0500
-@@ -29,7 +29,10 @@ HIDDEN define_lock (arm_lock);
+@@ -33,7 +33,10 @@ HIDDEN atomic_bool tdep_init_done = 0;
- HIDDEN int tdep_init_done;
+ /* Android only supports three types of unwinding methods. */
- 
+ HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_DWARF | UNW_ARM_METHOD_EXIDX | UNW_ARM_METHOD_LR;
- /* Unwinding methods to use. See UNW_METHOD_ enums */
+ #else
 -HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_ALL;
 +/* UNW_ARM_METHOD_ALL starts with UNW_ARM_METHOD_DWARF */
 +/* which is never right on Fedora ARM. Default instead */
 +/* to UNW_ARM_METHOD_EXIDX. */
 +HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_EXIDX;
+ #endif
  
  HIDDEN void
- tdep_init (void)

libunwind.spec

@@ -3,19 +3,21 @@
 
 Summary: An unwinding library
 Name: libunwind
-Version: 1.3.1
+Version: 1.6.2
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: BSD
 URL: http://savannah.nongnu.org/projects/libunwind
-
 Source: http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz
 
 #Fedora specific patch
 Patch1: libunwind-arm-default-to-exidx.patch
+# Make libunwind.h multilib friendly
+Patch2: libunwind-1.3.1-multilib-fix.patch
 
-ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
+ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
 
 BuildRequires: automake libtool autoconf texlive-latex2man
+BuildRequires: make
 
 # host != target would cause REMOTE_ONLY build even if building i386 on x86_64.
 %global _host %{_target_platform}
@@ -34,8 +36,10 @@ libunwind.
 %prep
 %setup -q
 %patch1 -p1 -b .default-to-exidx
+%patch2 -p1 -b .multilib-fix
 
 %build
+%global optflags %{optflags} -fcommon
 aclocal
 libtoolize --force
 autoheader
@@ -85,6 +89,34 @@ echo ====================TESTSUITE DISABLED=========================
 %{_includedir}/libunwind*.h
 
 %changelog
+* Mon Dec 20 2021 Tom Callaway <spot@fedoraproject.org> - 1.6.2-1
+- update to 1.6.2
+
+* Wed Jul 21 2021 Tom Callaway <spot@fedoraproject.org> - 1.5.0-1
+- update to 1.5.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Aug 13 2020 Tom Callaway <spot@fedoraproject.org> - 1.4.0-4
+- revert previous change
+- fix it properly
+
+* Mon Aug 10 2020 Tom Callaway <spot@fedoraproject.org> - 1.4.0-3
+- fix multilib issues with libunwind.h (bz1866512)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Apr 14 2020 Dan Horák <dan[at]danny.cz> - 1.4.0-1
+- Update to 1.4.0 with s390x support
+
+* Fri Jan 31 2020 Tom Callaway <spot@fedoraproject.org> - 1.3.1-5
+- backport change from upstream to fix reported test failures (bz1795896)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libunwind-1.3.1.tar.gz) = 3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def
+SHA512 (libunwind-1.6.2.tar.gz) = 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7