diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/musl-libs.patch')
-rw-r--r-- | meta/recipes-devtools/elfutils/files/musl-libs.patch | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/meta/recipes-devtools/elfutils/files/musl-libs.patch b/meta/recipes-devtools/elfutils/files/musl-libs.patch index 51ca630ef8..b9b9f120df 100644 --- a/meta/recipes-devtools/elfutils/files/musl-libs.patch +++ b/meta/recipes-devtools/elfutils/files/musl-libs.patch @@ -1,3 +1,8 @@ +From d5a1651df9884fcf57ed320bc2f866538af2f420 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 23 Aug 2019 10:18:47 +0800 +Subject: [PATCH 2/3] musl-libs + Collection of fixes needed to compile libelf and other libraries provided by elfutils for musl targets @@ -7,6 +12,21 @@ upstream given that elfutils has been closely tied to glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Inappropriate [workaround for musl] +Rebase to 0.177 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lib/error.h | 27 +++++++++++++++++++++++++++ + lib/fixedsizehash.h | 1 - + lib/libeu.h | 1 + + libdwfl/dwfl_error.c | 9 +++++++++ + libdwfl/linux-kernel-modules.c | 1 + + libelf/elf.h | 9 ++++++--- + 6 files changed, 44 insertions(+), 4 deletions(-) + create mode 100644 lib/error.h + +diff --git a/lib/error.h b/lib/error.h +new file mode 100644 +index 0000000..ef06827 --- /dev/null +++ b/lib/error.h @@ -0,0 +1,27 @@ @@ -37,6 +57,8 @@ Upstream-Status: Inappropriate [workaround for musl] +} + +#endif /* _ERROR_H_ */ +diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h +index dac2a5f..43016fc 100644 --- a/lib/fixedsizehash.h +++ b/lib/fixedsizehash.h @@ -30,7 +30,6 @@ @@ -47,6 +69,8 @@ Upstream-Status: Inappropriate [workaround for musl] #include <system.h> +diff --git a/lib/libeu.h b/lib/libeu.h +index ecb4d01..edc85e3 100644 --- a/lib/libeu.h +++ b/lib/libeu.h @@ -29,6 +29,7 @@ @@ -57,6 +81,8 @@ Upstream-Status: Inappropriate [workaround for musl] #include <stddef.h> #include <stdint.h> +diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c +index 7bcf61c..11dcc8b 100644 --- a/libdwfl/dwfl_error.c +++ b/libdwfl/dwfl_error.c @@ -154,7 +154,16 @@ dwfl_errmsg (int error) @@ -76,6 +102,8 @@ Upstream-Status: Inappropriate [workaround for musl] case OTHER_ERROR (LIBELF): return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): +diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c +index d46ab5a..1c3faee 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -50,6 +50,7 @@ @@ -86,6 +114,8 @@ Upstream-Status: Inappropriate [workaround for musl] /* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ +diff --git a/libelf/elf.h b/libelf/elf.h +index bed273d..be228e6 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -21,7 +21,9 @@ @@ -99,9 +129,9 @@ Upstream-Status: Inappropriate [workaround for musl] /* Standard ELF types. */ -@@ -3937,6 +3939,7 @@ enum - #define R_METAG_TLS_LE_HI16 60 - #define R_METAG_TLS_LE_LO16 61 +@@ -4029,6 +4031,7 @@ enum + #define R_NDS32_TLS_TPOFF 102 + #define R_NDS32_TLS_DESC 119 -__END_DECLS - @@ -109,3 +139,6 @@ Upstream-Status: Inappropriate [workaround for musl] +} +#endif #endif /* elf.h */ +-- +2.7.4 + |