diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-03-23 06:51:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:54:52 +0100 |
| commit | c1847278dbfc3424790f7256be2b35bcdbaaf018 (patch) | |
| tree | 1c885c96b3e9e53cbec63112fa7680c5cf55dc27 | |
| parent | 2145bd0d188158c2db85b583b4d7f3ad4612593b (diff) | |
| download | openembedded-core-c1847278dbfc3424790f7256be2b35bcdbaaf018.tar.gz openembedded-core-c1847278dbfc3424790f7256be2b35bcdbaaf018.tar.bz2 openembedded-core-c1847278dbfc3424790f7256be2b35bcdbaaf018.zip | |
libunwind: Fix build on mips/mips64 for musl targets
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch | 90 | ||||
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind_1.1.bb | 1 |
2 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch b/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch new file mode 100644 index 0000000000..5426fcc5c1 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind-1.1/0001-Fix-build-on-mips-musl.patch @@ -0,0 +1,90 @@ +From e623c7703945a5eb6c9a30586ec5e23b2f7396f6 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] Fix build on mips/musl + +Do not include endian.h on musl it includes +further headers which can not be compiled in __ASSEMBLER__ + mode + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/coredump/_UCD_internal.h | 34 ++++++++++++++++++++++++++++++++++ + src/mips/getcontext.S | 3 +-- + 2 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/src/coredump/_UCD_internal.h b/src/coredump/_UCD_internal.h +index 3c95a2a..80acc15 100644 +--- a/src/coredump/_UCD_internal.h ++++ b/src/coredump/_UCD_internal.h +@@ -34,6 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + #ifdef HAVE_SYS_PROCFS_H + #include <sys/procfs.h> /* struct elf_prstatus */ + #endif ++#include <sys/reg.h> + #include <errno.h> + #include <string.h> + #include <limits.h> +@@ -44,6 +45,39 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "libunwind_i.h" + ++#ifndef __GLIBC__ ++#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 +-- +1.8.3.1 + diff --git a/meta/recipes-support/libunwind/libunwind_1.1.bb b/meta/recipes-support/libunwind/libunwind_1.1.bb index 1ed525f515..aff84092a6 100644 --- a/meta/recipes-support/libunwind/libunwind_1.1.bb +++ b/meta/recipes-support/libunwind/libunwind_1.1.bb @@ -12,6 +12,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ SRC_URI_append_libc-musl = "\ file://0001-x86-Stub-out-x86_local_resume.patch \ file://0001-disable-tests.patch \ + file://0001-Fix-build-on-mips-musl.patch \ " SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce" SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a" |