summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-06-05 21:53:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-06 19:52:26 +0100
commit1125621b921763ff73614aae228d2d5dbb5bd2ce (patch)
tree7ba301a702f85e2a6822928c5fe0f2157fcc9ba7 /meta/recipes-support
parent97b36d5ee25b1a758c8b5bf8218d518abec9d4be (diff)
downloadpoky-1125621b921763ff73614aae228d2d5dbb5bd2ce.tar.gz
libunwind: fix build failure on MIPS
(From OE-Core rev: 49c255494c1d0704a1c8c428281c81541b05dc3e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libunwind/libunwind/fix-mips.patch134
-rw-r--r--meta/recipes-support/libunwind/libunwind_1.2.bb1
2 files changed, 135 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/fix-mips.patch b/meta/recipes-support/libunwind/libunwind/fix-mips.patch
new file mode 100644
index 0000000000..0022237934
--- /dev/null
+++ b/meta/recipes-support/libunwind/libunwind/fix-mips.patch
@@ -0,0 +1,134 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 5f354cb7b9c84dae006f0ebd8ad7a78d7e2aad0c Mon Sep 17 00:00:00 2001
5From: Dave Watson <davejwatson@fb.com>
6Date: Wed, 25 Jan 2017 16:18:02 -0800
7Subject: [PATCH] mips/tilegx: Add missing unwind_i.h header file
8
9reported-by: John Knight <John.Knight@belkin.com>
10---
11 src/Makefile.am | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/Makefile.am b/src/Makefile.am
15index 5d874755..7de4c425 100644
16--- a/src/Makefile.am
17+++ b/src/Makefile.am
18@@ -280,7 +280,7 @@ libunwind_hppa_la_SOURCES_hppa = $(libunwind_la_SOURCES_hppa_common) \
19 hppa/Gresume.c hppa/Gstep.c
20
21 # The list of files that go info libunwind and libunwind-mips:
22-noinst_HEADERS += mips/init.h mips/offsets.h
23+noinst_HEADERS += mips/init.h mips/offsets.h mips/unwind_i.h
24 libunwind_la_SOURCES_mips_common = $(libunwind_la_SOURCES_common) \
25 mips/is_fpreg.c mips/regname.c
26
27@@ -299,7 +299,7 @@ libunwind_mips_la_SOURCES_mips = $(libunwind_la_SOURCES_mips_common) \
28 mips/Gis_signal_frame.c mips/Gregs.c mips/Gresume.c mips/Gstep.c
29
30 # The list of files that go info libunwind and libunwind-tilegx:
31-noinst_HEADERS += tilegx/init.h tilegx/offsets.h
32+noinst_HEADERS += tilegx/init.h tilegx/offsets.h tilegx/unwind_i.h
33 libunwind_la_SOURCES_tilegx_common = $(libunwind_la_SOURCES_common) \
34 tilegx/is_fpreg.c tilegx/regname.c
35
36diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h
37new file mode 100644
38index 0000000..3382dcf
39--- /dev/null
40+++ b/src/mips/unwind_i.h
41@@ -0,0 +1,43 @@
42+/* libunwind - a platform-independent unwind library
43+ Copyright (C) 2008 CodeSourcery
44+
45+This file is part of libunwind.
46+
47+Permission is hereby granted, free of charge, to any person obtaining
48+a copy of this software and associated documentation files (the
49+"Software"), to deal in the Software without restriction, including
50+without limitation the rights to use, copy, modify, merge, publish,
51+distribute, sublicense, and/or sell copies of the Software, and to
52+permit persons to whom the Software is furnished to do so, subject to
53+the following conditions:
54+
55+The above copyright notice and this permission notice shall be
56+included in all copies or substantial portions of the Software.
57+
58+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
59+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
60+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
61+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
62+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
63+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
64+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
65+
66+#ifndef unwind_i_h
67+#define unwind_i_h
68+
69+#include <stdint.h>
70+
71+#include <libunwind-mips.h>
72+
73+#include "libunwind_i.h"
74+
75+#define mips_lock UNW_OBJ(lock)
76+#define mips_local_resume UNW_OBJ(local_resume)
77+#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init)
78+
79+extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor,
80+ void *arg);
81+
82+extern void mips_local_addr_space_init (void);
83+
84+#endif /* unwind_i_h */
85diff --git a/src/tilegx/unwind_i.h b/src/tilegx/unwind_i.h
86new file mode 100644
87index 0000000..aac7be3
88--- /dev/null
89+++ b/src/tilegx/unwind_i.h
90@@ -0,0 +1,44 @@
91+/* libunwind - a platform-independent unwind library
92+ Copyright (C) 2008 CodeSourcery
93+
94+This file is part of libunwind.
95+
96+Permission is hereby granted, free of charge, to any person obtaining
97+a copy of this software and associated documentation files (the
98+"Software"), to deal in the Software without restriction, including
99+without limitation the rights to use, copy, modify, merge, publish,
100+distribute, sublicense, and/or sell copies of the Software, and to
101+permit persons to whom the Software is furnished to do so, subject to
102+the following conditions:
103+
104+The above copyright notice and this permission notice shall be
105+included in all copies or substantial portions of the Software.
106+
107+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
108+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
109+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
110+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
111+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
112+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
113+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
114+
115+#ifndef unwind_i_h
116+#define unwind_i_h
117+
118+#include <memory.h>
119+#include <stdint.h>
120+
121+#include <libunwind-tilegx.h>
122+
123+#include "libunwind_i.h"
124+
125+#define tilegx_local_resume UNW_OBJ(local_resume)
126+#define tilegx_local_addr_space_init UNW_OBJ(local_addr_space_init)
127+
128+extern int tilegx_local_resume (unw_addr_space_t as,
129+ unw_cursor_t *cursor,
130+ void *arg);
131+
132+extern void tilegx_local_addr_space_init (void);
133+
134+#endif /* unwind_i_h */
diff --git a/meta/recipes-support/libunwind/libunwind_1.2.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb
index a398d332e2..e598e40c6f 100644
--- a/meta/recipes-support/libunwind/libunwind_1.2.bb
+++ b/meta/recipes-support/libunwind/libunwind_1.2.bb
@@ -11,6 +11,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV
11 file://0001-add-knobs-to-disable-enable-tests.patch \ 11 file://0001-add-knobs-to-disable-enable-tests.patch \
12 file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ 12 file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \
13 file://libunwind-1.1-x32.patch \ 13 file://libunwind-1.1-x32.patch \
14 file://fix-mips.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"