summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libunwind
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-08 15:11:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-12 14:04:31 +0000
commitdada38c453de5724cb8a0c2558ee6da6a7f04698 (patch)
tree0f7870b48d961a979fde8f241368da0fee7ce73a /meta/recipes-support/libunwind
parent3f9d1c6351f6b8522f5617df2e764cca512ef689 (diff)
downloadpoky-dada38c453de5724cb8a0c2558ee6da6a7f04698.tar.gz
libunwind: Upgrade to 1.3.1 release
- Drop upstreamed patch to enable/disable tests - Forward port rest of patches to new version (From OE-Core rev: 0471307da8d1e0df27df115c47d05e7b64dea080) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libunwind')
-rw-r--r--meta/recipes-support/libunwind/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch (renamed from meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch)25
-rw-r--r--meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch69
-rw-r--r--meta/recipes-support/libunwind/libunwind/0002-backtrace-Use-only-with-glibc-and-uclibc.patch (renamed from meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch)12
-rw-r--r--meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch (renamed from meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch)18
-rw-r--r--meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch (renamed from meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch)35
-rw-r--r--meta/recipes-support/libunwind/libunwind/0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch (renamed from meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch)17
-rw-r--r--meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch (renamed from meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch)11
-rw-r--r--meta/recipes-support/libunwind/libunwind_1.3.1.bb (renamed from meta/recipes-support/libunwind/libunwind_1.2.1.bb)21
8 files changed, 73 insertions, 135 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/meta/recipes-support/libunwind/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
index c8faca4724..437b878365 100644
--- a/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
+++ b/meta/recipes-support/libunwind/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
@@ -1,7 +1,7 @@
1From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 1From 599f10ac3a24e419a93f97fddbe14de01b1185ea Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Tue, 13 May 2014 23:32:27 +0200 3Date: Tue, 13 May 2014 23:32:27 +0200
4Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 4Subject: [PATCH 1/6] Add AO_REQUIRE_CAS to fix build on ARM < v6
5 5
6ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide 6ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide
7optimize atomic operations in libatomic_ops. Since libunwind is using 7optimize atomic operations in libatomic_ops. Since libunwind is using
@@ -28,10 +28,10 @@ https://raw.githubusercontent.com/rdnetto/teapot-buildroot/master/package/libunw
28 include/libunwind_i.h | 1 + 28 include/libunwind_i.h | 1 +
29 2 files changed, 2 insertions(+), 7 deletions(-) 29 2 files changed, 2 insertions(+), 7 deletions(-)
30 30
31Index: libunwind-1.2.1/acinclude.m4 31diff --git a/acinclude.m4 b/acinclude.m4
32=================================================================== 32index 497f7c2..9c15af1 100644
33--- libunwind-1.2.1.orig/acinclude.m4 33--- a/acinclude.m4
34+++ libunwind-1.2.1/acinclude.m4 34+++ b/acinclude.m4
35@@ -22,11 +22,5 @@ fi]) 35@@ -22,11 +22,5 @@ fi])
36 AC_DEFUN([CHECK_ATOMIC_OPS], 36 AC_DEFUN([CHECK_ATOMIC_OPS],
37 [dnl Check whether the system has the atomic_ops package installed. 37 [dnl Check whether the system has the atomic_ops package installed.
@@ -45,11 +45,11 @@ Index: libunwind-1.2.1/acinclude.m4
45-# AC_CHECK_LIB(atomic_ops, main) 45-# AC_CHECK_LIB(atomic_ops, main)
46+ AC_CHECK_LIB(atomic_ops, main) 46+ AC_CHECK_LIB(atomic_ops, main)
47 ]) 47 ])
48Index: libunwind-1.2.1/include/libunwind_i.h 48diff --git a/include/libunwind_i.h b/include/libunwind_i.h
49=================================================================== 49index 36cf7a1..33b4ca3 100644
50--- libunwind-1.2.1.orig/include/libunwind_i.h 50--- a/include/libunwind_i.h
51+++ libunwind-1.2.1/include/libunwind_i.h 51+++ b/include/libunwind_i.h
52@@ -116,6 +116,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE 52@@ -124,6 +124,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
53 (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) 53 (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0)
54 54
55 #ifdef HAVE_ATOMIC_OPS_H 55 #ifdef HAVE_ATOMIC_OPS_H
@@ -57,3 +57,6 @@ Index: libunwind-1.2.1/include/libunwind_i.h
57 # include <atomic_ops.h> 57 # include <atomic_ops.h>
58 static inline int 58 static inline int
59 cmpxchg_ptr (void *addr, void *old, void *new) 59 cmpxchg_ptr (void *addr, void *old, void *new)
60--
612.20.1
62
diff --git a/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch b/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
deleted file mode 100644
index 673a5bb995..0000000000
--- a/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 459e471fcc33d300f7bbcdaf3e0dc338d9dc15b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 16:56:34 +0000
4Subject: [PATCH] add knobs to disable/enable tests
5
6Some tests do not compile on musl libc
7in general its good to have such a knob
8since not all builds may want to enable
9tests
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Makefile.am | 6 +++++-
16 configure.ac | 12 ++++++++++--
17 2 files changed, 15 insertions(+), 3 deletions(-)
18
19diff --git a/Makefile.am b/Makefile.am
20index 6a3ed9e..0c29b3e 100644
21--- a/Makefile.am
22+++ b/Makefile.am
23@@ -42,7 +42,11 @@ endif
24
25 nodist_include_HEADERS = include/libunwind-common.h
26
27-SUBDIRS = src tests
28+SUBDIRS = src
29+
30+if CONFIG_TESTS
31+SUBDIRS += tests
32+endif
33
34 if CONFIG_DOCS
35 SUBDIRS += doc
36diff --git a/configure.ac b/configure.ac
37index 85d78f8..d362387 100644
38--- a/configure.ac
39+++ b/configure.ac
40@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation,
41 AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),,
42 [enable_documentation=yes])
43
44+AC_ARG_ENABLE(tests,
45+ AS_HELP_STRING([--disable-tests],[Disable building tests]),,
46+ [enable_tests=yes])
47+
48 AC_MSG_CHECKING([if we should build libunwind-setjmp])
49 AC_MSG_RESULT([$enable_setjmp])
50
51@@ -395,9 +399,13 @@ AM_CONDITIONAL([CONFIG_DOCS], [test x$enable_documentation = xyes])
52 if test "x$enable_documentation" = "xyes"; then
53 AC_CONFIG_FILES(doc/Makefile doc/common.tex)
54 fi
55+AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes])
56+if test "x$enable_tests" = "xyes"; then
57+ AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh)
58+fi
59+
60
61-AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
62- include/libunwind-common.h
63+AC_CONFIG_FILES(Makefile src/Makefile include/libunwind-common.h
64 include/libunwind.h include/tdep/libunwind_i.h)
65 AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc
66 src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc
67--
681.8.3.1
69
diff --git a/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch b/meta/recipes-support/libunwind/libunwind/0002-backtrace-Use-only-with-glibc-and-uclibc.patch
index 9aed419a12..1b862dccb1 100644
--- a/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch
+++ b/meta/recipes-support/libunwind/libunwind/0002-backtrace-Use-only-with-glibc-and-uclibc.patch
@@ -1,20 +1,20 @@
1From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 1From b61446add7ae1c041266c2fa5ba2f51cb3b65d35 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 06:44:07 +0000 3Date: Thu, 31 Dec 2015 06:44:07 +0000
4Subject: [PATCH] backtrace: Use only with glibc and uclibc 4Subject: [PATCH 2/6] backtrace: Use only with glibc and uclibc
5 5
6backtrace API is glibc specific not linux specific 6backtrace API is glibc specific not linux specific
7so make it behave so. 7so make it behave so.
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending 9Upstream-Status: Pending
12 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 tests/test-coredump-unwind.c | 4 +++- 13 tests/test-coredump-unwind.c | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-) 14 1 file changed, 3 insertions(+), 1 deletion(-)
15 15
16diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c 16diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c
17index 5254708..8767b42 100644 17index 5349823..3b153cb 100644
18--- a/tests/test-coredump-unwind.c 18--- a/tests/test-coredump-unwind.c
19+++ b/tests/test-coredump-unwind.c 19+++ b/tests/test-coredump-unwind.c
20@@ -57,7 +57,9 @@ 20@@ -57,7 +57,9 @@
@@ -41,5 +41,5 @@ index 5254708..8767b42 100644
41 #endif 41 #endif
42 } 42 }
43-- 43--
442.6.4 442.20.1
45 45
diff --git a/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch b/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch
index 371013aaaa..508ed6af38 100644
--- a/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch
+++ b/meta/recipes-support/libunwind/libunwind/0003-x86-Stub-out-x86_local_resume.patch
@@ -1,7 +1,7 @@
1From f5df01655a4b76d4fe415747de581d94ac593e6a Mon Sep 17 00:00:00 2001 1From f6866b9e4a6341c50eb1d923dbf48eca2ca40140 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 22 Mar 2016 16:19:29 +0000 3Date: Tue, 22 Mar 2016 16:19:29 +0000
4Subject: [PATCH] x86: Stub out x86_local_resume() 4Subject: [PATCH 3/6] x86: Stub out x86_local_resume()
5 5
6its purpose seems 6its purpose seems
7to be unwinding across signal handler boundaries, which cannot happen 7to be unwinding across signal handler boundaries, which cannot happen
@@ -9,18 +9,18 @@ in correct programs anyway. Replacing the whole function with
9something like *(volatile char *)0=0; (i.e. crash), gets a working 9something like *(volatile char *)0=0; (i.e. crash), gets a working
10libunwind 10libunwind
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 14
15---
16 src/x86/Gos-linux.c | 22 +--------------------- 16 src/x86/Gos-linux.c | 22 +---------------------
17 1 file changed, 1 insertion(+), 21 deletions(-) 17 1 file changed, 1 insertion(+), 21 deletions(-)
18 18
19diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c 19diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c
20index 31f83ba..3aaa34e 100644 20index fb9a5e3..c25ae0c 100644
21--- a/src/x86/Gos-linux.c 21--- a/src/x86/Gos-linux.c
22+++ b/src/x86/Gos-linux.c 22+++ b/src/x86/Gos-linux.c
23@@ -281,27 +281,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg) 23@@ -284,27 +284,7 @@ x86_r_uc_addr (ucontext_t *uc, int reg)
24 HIDDEN int 24 HIDDEN int
25 x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) 25 x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
26 { 26 {
@@ -38,7 +38,7 @@ index 31f83ba..3aaa34e 100644
38- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; 38- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr;
39- 39-
40- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); 40- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc);
41- sigreturn (sc); 41- x86_sigreturn (sc);
42- } 42- }
43- else 43- else
44- { 44- {
@@ -48,7 +48,7 @@ index 31f83ba..3aaa34e 100644
48+ *(volatile char *)0=0; 48+ *(volatile char *)0=0;
49 return -UNW_EINVAL; 49 return -UNW_EINVAL;
50 } 50 }
51 #endif 51
52-- 52--
531.8.3.1 532.20.1
54 54
diff --git a/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch
index 8bcc252bad..124d0e00b1 100644
--- a/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch
+++ b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch
@@ -1,25 +1,25 @@
1From e623c7703945a5eb6c9a30586ec5e23b2f7396f6 Mon Sep 17 00:00:00 2001 1From 6bdab5cc8f1e2ec5f84fc9f59f1699a726980709 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 23 Mar 2016 06:08:59 +0000 3Date: Wed, 23 Mar 2016 06:08:59 +0000
4Subject: [PATCH] Fix build on mips/musl 4Subject: [PATCH 4/6] Fix build on mips/musl
5 5
6Do not include endian.h on musl it includes 6Do not include endian.h on musl it includes
7further headers which can not be compiled in __ASSEMBLER__ 7further headers which can not be compiled in __ASSEMBLER__
8 mode 8 mode
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 12
14 src/coredump/_UCD_internal.h | 34 ++++++++++++++++++++++++++++++++++ 13---
14 src/coredump/_UCD_internal.h | 35 +++++++++++++++++++++++++++++++++++
15 src/mips/getcontext.S | 3 +-- 15 src/mips/getcontext.S | 3 +--
16 2 files changed, 35 insertions(+), 2 deletions(-) 16 2 files changed, 36 insertions(+), 2 deletions(-)
17 17
18Index: git/src/coredump/_UCD_internal.h 18diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h
19=================================================================== 19index 3c95a2a..21ed1c3 100644
20--- git.orig/src/coredump/_UCD_internal.h 20--- a/src/coredump/_UCD_internal.h
21+++ git/src/coredump/_UCD_internal.h 21+++ b/src/coredump/_UCD_internal.h
22@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE 22@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
23 23
24 #include "libunwind_i.h" 24 #include "libunwind_i.h"
25 25
@@ -61,11 +61,11 @@ Index: git/src/coredump/_UCD_internal.h
61 61
62 #if SIZEOF_OFF_T == 4 62 #if SIZEOF_OFF_T == 4
63 typedef uint32_t uoff_t; 63 typedef uint32_t uoff_t;
64Index: git/src/mips/getcontext.S 64diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S
65=================================================================== 65index d1dbd57..de9b681 100644
66--- git.orig/src/mips/getcontext.S 66--- a/src/mips/getcontext.S
67+++ git/src/mips/getcontext.S 67+++ b/src/mips/getcontext.S
68@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING 68@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
69 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 69 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
70 70
71 #include "offsets.h" 71 #include "offsets.h"
@@ -79,3 +79,6 @@ Index: git/src/mips/getcontext.S
79 # define OFFSET 4 79 # define OFFSET 4
80 # else 80 # else
81 # define OFFSET 0 81 # define OFFSET 0
82--
832.20.1
84
diff --git a/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch b/meta/recipes-support/libunwind/libunwind/0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
index ca0641f5ac..edaa822be1 100644
--- a/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
+++ b/meta/recipes-support/libunwind/libunwind/0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
@@ -1,7 +1,8 @@
1From e0eea53c77fce8537c58a072b684043507987bcc Mon Sep 17 00:00:00 2001 1From 02919d74b1599979884f9cee466ed392d9fc4819 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Jul 2016 01:07:53 +0000 3Date: Sat, 9 Jul 2016 01:07:53 +0000
4Subject: [PATCH] ppc32: Consider ucontext mismatches between glibc and musl 4Subject: [PATCH 5/6] ppc32: Consider ucontext mismatches between glibc and
5 musl
5 6
6This helps in porting libunwind onto musl based systems 7This helps in porting libunwind onto musl based systems
7ptrace.h change is required again an error that surfaces 8ptrace.h change is required again an error that surfaces
@@ -18,17 +19,17 @@ In file included from /mnt/oe/openembedded-core/build/tmp-musl/sysroots/qemuppc/
18 struct pt_regs { 19 struct pt_regs {
19 ^~~~~~~ 20 ^~~~~~~
20 21
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23Upstream-Status: Pending 22Upstream-Status: Pending
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24 24
25---
25 src/ppc32/Ginit.c | 6 +- 26 src/ppc32/Ginit.c | 6 +-
26 src/ppc32/ucontext_i.h | 158 ++++++++++++++++++++++--------------------- 27 src/ppc32/ucontext_i.h | 158 ++++++++++++++++++-----------------
27 src/ptrace/_UPT_reg_offset.c | 7 ++ 28 src/ptrace/_UPT_reg_offset.c | 7 ++
28 3 files changed, 92 insertions(+), 79 deletions(-) 29 3 files changed, 92 insertions(+), 79 deletions(-)
29 30
30diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c 31diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c
31index f2e6e82..617aaa1 100644 32index ba30244..c5312d9 100644
32--- a/src/ppc32/Ginit.c 33--- a/src/ppc32/Ginit.c
33+++ b/src/ppc32/Ginit.c 34+++ b/src/ppc32/Ginit.c
34@@ -48,12 +48,12 @@ uc_addr (ucontext_t *uc, int reg) 35@@ -48,12 +48,12 @@ uc_addr (ucontext_t *uc, int reg)
@@ -226,7 +227,7 @@ index c6ba806..b79f15c 100644
226 227
227 #endif 228 #endif
228diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c 229diff --git a/src/ptrace/_UPT_reg_offset.c b/src/ptrace/_UPT_reg_offset.c
229index 68461a2..fcc43f7 100644 230index c82d1c9..6c31baa 100644
230--- a/src/ptrace/_UPT_reg_offset.c 231--- a/src/ptrace/_UPT_reg_offset.c
231+++ b/src/ptrace/_UPT_reg_offset.c 232+++ b/src/ptrace/_UPT_reg_offset.c
232@@ -27,6 +27,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 233@@ -27,6 +27,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
@@ -244,5 +245,5 @@ index 68461a2..fcc43f7 100644
244 #ifdef HAVE_ASM_PTRACE_OFFSETS_H 245 #ifdef HAVE_ASM_PTRACE_OFFSETS_H
245 # include <asm/ptrace_offsets.h> 246 # include <asm/ptrace_offsets.h>
246-- 247--
2471.8.3.1 2482.20.1
248 249
diff --git a/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch b/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch
index 32516464cd..37ae8124cc 100644
--- a/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
+++ b/meta/recipes-support/libunwind/libunwind/0006-Fix-for-X32.patch
@@ -1,21 +1,22 @@
1From 506bd37bd580d7382d7c58257dac4b1e502a887c Mon Sep 17 00:00:00 2001 1From 7a4fd5933cc795df85cdd85168fe54fbaec4dcec Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 09:50:34 -0700 3Date: Tue, 13 Dec 2016 09:50:34 -0700
4Subject: [PATCH] Fix for X32 4Subject: [PATCH 6/6] Fix for X32
5 5
6Apply patch to fix the X32 build from https://github.com/sjnewbury/x32. 6Apply patch to fix the X32 build from https://github.com/sjnewbury/x32.
7 7
8Upstream-Status: Pending 8Upstream-Status: Pending
9Signed-off-by: Christopher Larson <chris_larson@mentor.com> 9Signed-off-by: Christopher Larson <chris_larson@mentor.com>
10
10--- 11---
11 src/x86_64/Gos-linux.c | 4 ++-- 12 src/x86_64/Gos-linux.c | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 2 insertions(+), 2 deletions(-)
13 14
14diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c 15diff --git a/src/x86_64/Gos-linux.c b/src/x86_64/Gos-linux.c
15index 9e1acfc..8169d5a 100644 16index bd14234..be1cb5b 100644
16--- a/src/x86_64/Gos-linux.c 17--- a/src/x86_64/Gos-linux.c
17+++ b/src/x86_64/Gos-linux.c 18+++ b/src/x86_64/Gos-linux.c
18@@ -143,8 +143,8 @@ x86_64_sigreturn (unw_cursor_t *cursor) 19@@ -145,8 +145,8 @@ x86_64_sigreturn (unw_cursor_t *cursor)
19 20
20 Debug (8, "resuming at ip=%llx via sigreturn(%p)\n", 21 Debug (8, "resuming at ip=%llx via sigreturn(%p)\n",
21 (unsigned long long) c->dwarf.ip, sc); 22 (unsigned long long) c->dwarf.ip, sc);
@@ -27,5 +28,5 @@ index 9e1acfc..8169d5a 100644
27 :: "r"(sc), "i"(SYS_rt_sigreturn) 28 :: "r"(sc), "i"(SYS_rt_sigreturn)
28 : "memory"); 29 : "memory");
29-- 30--
302.8.0 312.20.1
31 32
diff --git a/meta/recipes-support/libunwind/libunwind_1.2.1.bb b/meta/recipes-support/libunwind/libunwind_1.3.1.bb
index c9239b695e..037e04c3c0 100644
--- a/meta/recipes-support/libunwind/libunwind_1.2.1.bb
+++ b/meta/recipes-support/libunwind/libunwind_1.3.1.bb
@@ -1,19 +1,18 @@
1require libunwind.inc 1require libunwind.inc
2 2
3SRC_URI[md5sum] = "06ba9e60d92fd6f55cd9dadb084df19e"
4SRC_URI[sha256sum] = "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb"
5
6SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ 3SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \
7 file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ 4 file://0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \
8 file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ 5 file://0002-backtrace-Use-only-with-glibc-and-uclibc.patch \
9 file://0001-x86-Stub-out-x86_local_resume.patch \ 6 file://0003-x86-Stub-out-x86_local_resume.patch \
10 file://0001-Fix-build-on-mips-musl.patch \ 7 file://0004-Fix-build-on-mips-musl.patch \
11 file://0001-add-knobs-to-disable-enable-tests.patch \ 8 file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \
12 file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ 9 file://0006-Fix-for-X32.patch \
13 file://libunwind-1.1-x32.patch \
14 " 10 "
15
16SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" 11SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
12
13SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6"
14SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8"
15
17EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" 16EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static"
18 17
19# http://errors.yoctoproject.org/Errors/Details/20487/ 18# http://errors.yoctoproject.org/Errors/Details/20487/