diff options
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind_git.bb | 1 |
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 @@ +From 506bd37bd580d7382d7c58257dac4b1e502a887c Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 09:50:34 -0700 +Subject: [PATCH] Fix for X32 + +Apply patch to fix the X32 build from https://github.com/sjnewbury/x32. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + src/x86_64/Gos-linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c +index 9e1acfc..8169d5a 100644 +--- a/src/x86_64/Gos-linux.c ++++ b/src/x86_64/Gos-linux.c +@@ -143,8 +143,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) + + 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"); +-- +2.8.0 + 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 \ file://0001-Fix-build-on-mips-musl.patch \ file://0001-add-knobs-to-disable-enable-tests.patch \ file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ + file://libunwind-1.1-x32.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" |