diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-02-08 15:11:45 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-12 14:04:24 +0000 |
| commit | 0471307da8d1e0df27df115c47d05e7b64dea080 (patch) | |
| tree | 8c8d99106b82fa7843e2ae940cbb9dc120dd5498 /meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch | |
| parent | 680ad16dd5f7bb131cf226897c18eb3ed748cb6c (diff) | |
| download | openembedded-core-contrib-0471307da8d1e0df27df115c47d05e7b64dea080.tar.gz | |
libunwind: Upgrade to 1.3.1 release
- Drop upstreamed patch to enable/disable tests
- Forward port rest of patches to new version
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/libunwind/0004-Fix-build-on-mips-musl.patch')
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch new file mode 100644 index 0000000000..124d0e00b1 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/0004-Fix-build-on-mips-musl.patch @@ -0,0 +1,84 @@ +From 6bdab5cc8f1e2ec5f84fc9f59f1699a726980709 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 23 Mar 2016 06:08:59 +0000 +Subject: [PATCH 4/6] Fix build on mips/musl + +Do not include endian.h on musl it includes +further headers which can not be compiled in __ASSEMBLER__ + mode + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/coredump/_UCD_internal.h | 35 +++++++++++++++++++++++++++++++++++ + src/mips/getcontext.S | 3 +-- + 2 files changed, 36 insertions(+), 2 deletions(-) + +diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h +index 3c95a2a..21ed1c3 100644 +--- a/src/coredump/_UCD_internal.h ++++ b/src/coredump/_UCD_internal.h +@@ -44,6 +44,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "libunwind_i.h" + ++#ifndef __GLIBC__ ++#include <sys/reg.h> ++ ++#define EF_REG0 6 ++#define EF_REG1 7 ++#define EF_REG2 8 ++#define EF_REG3 9 ++#define EF_REG4 10 ++#define EF_REG5 11 ++#define EF_REG6 12 ++#define EF_REG7 13 ++#define EF_REG8 14 ++#define EF_REG9 15 ++#define EF_REG10 16 ++#define EF_REG11 17 ++#define EF_REG12 18 ++#define EF_REG13 19 ++#define EF_REG14 20 ++#define EF_REG15 21 ++#define EF_REG16 22 ++#define EF_REG17 23 ++#define EF_REG18 24 ++#define EF_REG19 25 ++#define EF_REG20 26 ++#define EF_REG21 27 ++#define EF_REG22 28 ++#define EF_REG23 29 ++#define EF_REG24 30 ++#define EF_REG25 31 ++#define EF_REG28 34 ++#define EF_REG29 35 ++#define EF_REG30 36 ++#define EF_REG31 37 ++#endif ++ + + #if SIZEOF_OFF_T == 4 + typedef uint32_t uoff_t; +diff --git a/src/mips/getcontext.S b/src/mips/getcontext.S +index d1dbd57..de9b681 100644 +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S +@@ -24,12 +24,11 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + + .text + + #if _MIPS_SIM == _ABIO32 +-# if __BYTE_ORDER == __BIG_ENDIAN ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define OFFSET 4 + # else + # define OFFSET 0 +-- +2.20.1 + |