summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch31
-rw-r--r--meta/recipes-support/libunwind/libunwind_git.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch b/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
new file mode 100644
index 0000000000..32516464cd
--- /dev/null
+++ b/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
@@ -0,0 +1,31 @@
1From 506bd37bd580d7382d7c58257dac4b1e502a887c Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 09:50:34 -0700
4Subject: [PATCH] Fix for X32
5
6Apply patch to fix the X32 build from https://github.com/sjnewbury/x32.
7
8Upstream-Status: Pending
9Signed-off-by: Christopher Larson <chris_larson@mentor.com>
10---
11 src/x86_64/Gos-linux.c | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c
15index 9e1acfc..8169d5a 100644
16--- a/src/x86_64/Gos-linux.c
17+++ b/src/x86_64/Gos-linux.c
18@@ -143,8 +143,8 @@ x86_64_sigreturn (unw_cursor_t *cursor)
19
20 Debug (8, "resuming at ip=%llx via sigreturn(%p)\n",
21 (unsigned long long) c->dwarf.ip, sc);
22- __asm__ __volatile__ ("mov %0, %%rsp;"
23- "mov %1, %%rax;"
24+ __asm__ __volatile__ ("mov %q0, %%rsp;"
25+ "mov %q1, %%rax;"
26 "syscall"
27 :: "r"(sc), "i"(SYS_rt_sigreturn)
28 : "memory");
29--
302.8.0
31
diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_git.bb
index 424943087e..b637c5c448 100644
--- a/meta/recipes-support/libunwind/libunwind_git.bb
+++ b/meta/recipes-support/libunwind/libunwind_git.bb
@@ -11,6 +11,7 @@ SRC_URI = "git://git.sv.gnu.org/libunwind.git \
11 file://0001-Fix-build-on-mips-musl.patch \ 11 file://0001-Fix-build-on-mips-musl.patch \
12 file://0001-add-knobs-to-disable-enable-tests.patch \ 12 file://0001-add-knobs-to-disable-enable-tests.patch \
13 file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ 13 file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \
14 file://libunwind-1.1-x32.patch \
14 " 15 "
15 16
16SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" 17SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"