commit 7bb8270bbb95acc04cd7b2d3c9b34e0674a92ec7
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Feb 21 21:19:59 2018 +0100
- added x32 patch, added x32 to supported archs; release 2
libunwind-x32.patch | 13 +++++++++++++
libunwind.spec | 8 +++++---
2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/libunwind.spec b/libunwind.spec
index ed1574e..2cef2b6 100644
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -7,12 +7,13 @@ Summary: libunwind - a (mostly) platform-independent
unwind API
Summary(pl.UTF-8): libunwind - (prawie) niezależne od platformy API do
rozwijania
Name: libunwind
Version: 1.2.1
-Release: 1
+Release: 2
License: MIT
Group: Libraries
Source0:
http://download.savannah.gnu.org/releases/libunwind/%{name}-%{version}.tar.gz
# Source0-md5: 06ba9e60d92fd6f55cd9dadb084df19e
Patch0: %{name}-link.patch
+Patch1: %{name}-x32.patch
URL: http://www.nongnu.org/libunwind/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1.6
@@ -23,7 +24,7 @@ BuildRequires: binutils >= 2:2.15.94.0.2.2
BuildRequires: libtool >= 2:2.0
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: xz-devel
-ExclusiveArch: %{ix86} %{x8664} arm hppa ia64 mips ppc ppc64 sh
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm} hppa ia64 mips ppc ppc64 sh
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# some setjmp tricks expect non-redirected functions
@@ -33,7 +34,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{ix86}
%define asuf x86
%else
-%ifarch %{x8664}
+%ifarch %{x8664} x32
%define asuf x86_64
%else
%define asuf %{_target_cpu}
@@ -77,6 +78,7 @@ Statyczna biblioteka libunwind.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/libunwind-x32.patch b/libunwind-x32.patch
new file mode 100644
index 0000000..8a42a8d
--- /dev/null
+++ b/libunwind-x32.patch
@@ -0,0 +1,13 @@
+--- libunwind-1.2.1/src/x86_64/Gos-linux.c.orig 2017-06-15
23:26:53.000000000 +0200
++++ libunwind-1.2.1/src/x86_64/Gos-linux.c 2018-02-21 20:52:26.940974303
+0100
+@@ -143,8 +143,8 @@
+
+ Debug (8, "resuming at ip=%llx via sigreturn(%p)\n",
+ (unsigned long long) c->dwarf.ip, sc);
+- __asm__ __volatile__ ("mov %0, %%rsp;"
+- "mov %1, %%rax;"
++ __asm__ __volatile__ ("mov %q0, %%rsp;"
++ "mov %q1, %%rax;"
+ "syscall"
+ :: "r"(sc), "i"(SYS_rt_sigreturn)
+ : "memory");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libunwind.git/commitdiff/7bb8270bbb95acc04cd7b2d3c9b34e0674a92ec7
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
