From 5d7bc2445160ca914c927ed302d412f7b21906a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 14 Apr 2020 12:11:58 +0200
Subject: [PATCH] - Update to 1.4.0 with s390x support

---
 libunwind-1.3.1-no-core-mem-check.patch | 24 ------------------------
 libunwind.spec                          | 14 ++++++--------
 sources                                 |  2 +-
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 libunwind-1.3.1-no-core-mem-check.patch

diff --git a/libunwind-1.3.1-no-core-mem-check.patch b/libunwind-1.3.1-no-core-mem-check.patch
deleted file mode 100644
index b918c1d..0000000
--- a/libunwind-1.3.1-no-core-mem-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up libunwind-1.3.1/src/x86_64/Ginit.c.no-core-mem-check libunwind-1.3.1/src/x86_64/Ginit.c
---- libunwind-1.3.1/src/x86_64/Ginit.c.no-core-mem-check	2020-01-31 10:22:29.176612981 -0500
-+++ libunwind-1.3.1/src/x86_64/Ginit.c	2020-01-31 10:23:01.454979655 -0500
-@@ -140,11 +140,6 @@ static int mincore_validate (void *addr,
-       return -1;
-     }
- 
--  for (i = 0; i < (len + PAGE_SIZE - 1) / PAGE_SIZE; i++)
--    {
--      if (!(mvec[i] & 1)) return -1;
--    }
--
-   return write_validate (addr);
- }
- #endif
-@@ -165,7 +160,7 @@ tdep_init_mem_validate (void)
-   int ret;
-   while ((ret = mincore ((void*)addr, PAGE_SIZE, mvec)) == -1 &&
-          errno == EAGAIN) {}
--  if (ret == 0 && (mvec[0] & 1))
-+  if (ret == 0)
-     {
-       Debug(1, "using mincore to validate memory\n");
-       mem_validate_func = mincore_validate;
diff --git a/libunwind.spec b/libunwind.spec
index f15b9e6..45f9ae9 100644
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -3,20 +3,16 @@
 
 Summary: An unwinding library
 Name: libunwind
-Version: 1.3.1
-Release: 5%{?dist}
+Version: 1.4.0
+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
-# Backport this change from 1.4
-# https://github.com/libunwind/libunwind/commit/05d814b64036b1ea2f0f328b3a985b03559dcf10
-# https://bugzilla.redhat.com/show_bug.cgi?id=1795896
-Patch2: libunwind-1.3.1-no-core-mem-check.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
 
@@ -37,7 +33,6 @@ libunwind.
 %prep
 %setup -q
 %patch1 -p1 -b .default-to-exidx
-%patch2 -p1 -b .no-core-mem-check
 
 %build
 %global optflags %{optflags} -fcommon
@@ -90,6 +85,9 @@ echo ====================TESTSUITE DISABLED=========================
 %{_includedir}/libunwind*.h
 
 %changelog
+* 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)
 
diff --git a/sources b/sources
index 52a2b5d..5ed9b08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libunwind-1.3.1.tar.gz) = 3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def
+SHA512 (libunwind-1.4.0.tar.gz) = 60bce1e840f071d3a48cfa8e2acff988977956f659c5c04ce83f00751348fbbeddbfc54e8c9bd6ebc9073423ca5ee1816655dc5aa59fefd0a8edc9c3f7f3b913