1 |
commit: c8d170da873918e7969852ffdd48ff2904f65432 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 7 07:12:49 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 7 09:39:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d170da |
7 |
|
8 |
sys-libs/libunwind: fix ABI_X86=x32 build |
9 |
|
10 |
Reported-by: Jan Ziak |
11 |
Closes: https://bugs.gentoo.org/614374 |
12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
sys-libs/libunwind/files/libunwind-1.5.0-x32.patch | 17 +++++++++++++++++ |
16 |
sys-libs/libunwind/libunwind-1.5.0-r1.ebuild | 1 + |
17 |
2 files changed, 18 insertions(+) |
18 |
|
19 |
diff --git a/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..a3bbc81f45b |
22 |
--- /dev/null |
23 |
+++ b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch |
24 |
@@ -0,0 +1,17 @@ |
25 |
+https://bugs.gentoo.org/614374 |
26 |
+ |
27 |
+From: kasperk81 <83082615+kasperk81@××××××××××××××××××××.com> |
28 |
+Date: Wed, 30 Jun 2021 23:23:22 +0000 |
29 |
+Subject: [PATCH] Fix -mx32 compilation error |
30 |
+ |
31 |
+--- a/src/x86_64/Gos-linux.c |
32 |
++++ b/src/x86_64/Gos-linux.c |
33 |
+@@ -149,7 +149,7 @@ x86_64_sigreturn (unw_cursor_t *cursor) |
34 |
+ __asm__ __volatile__ ("mov %0, %%rsp;" |
35 |
+ "mov %1, %%rax;" |
36 |
+ "syscall" |
37 |
+- :: "r"(sc), "i"(SYS_rt_sigreturn) |
38 |
++ :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn) |
39 |
+ : "memory"); |
40 |
+ abort(); |
41 |
+ } |
42 |
|
43 |
diff --git a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild |
44 |
index ae510ed27fe..082fdab6ed8 100644 |
45 |
--- a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild |
46 |
+++ b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild |
47 |
@@ -49,6 +49,7 @@ PATCHES=( |
48 |
"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092 |
49 |
"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch |
50 |
"${FILESDIR}"/${PN}-1.2-ia64-missing.patch |
51 |
+ "${FILESDIR}"/${PN}-1.5.0-x32.patch |
52 |
# needs refresh: |
53 |
#"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch |
54 |
) |