diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-08-23 11:02:10 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-16 23:02:43 +0100 |
| commit | cc5d6ca85a40199a077403a0d0af0bd22eeefa06 (patch) | |
| tree | 518e9866a124caa48ff4f6b5e747b76bcd80ea0c /meta/recipes-devtools/elfutils/files/musl-libs.patch | |
| parent | 5b1e999c41a116a77bf22e3d6546eaabf67b2946 (diff) | |
| download | poky-cc5d6ca85a40199a077403a0d0af0bd22eeefa06.tar.gz | |
elfutils: 0.176 -> 0.177
- Update Debian patches
http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz
- Rebase Debian patches to 0.177
debian/hppa_backend.diff
debian/mips_backend.diff
debian/arm_backend.diff
debian/mips_readelf_w.patch
debian/testsuite-ignore-elflint.diff
debian/mips_cfi.patch
- Fix build failure while applying debian patches
0001-fix-compile-failure-with-debian-patches.patch
- Rebase musl patches
(From OE-Core rev: 35143611034758cc670e9d88bc93f97fe33c52fc)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
| 1 | From d5a1651df9884fcf57ed320bc2f866538af2f420 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Fri, 23 Aug 2019 10:18:47 +0800 | ||
| 4 | Subject: [PATCH 2/3] musl-libs | ||
| 5 | |||
| 1 | Collection of fixes needed to compile libelf and other libraries | 6 | Collection of fixes needed to compile libelf and other libraries |
| 2 | provided by elfutils for musl targets | 7 | provided by elfutils for musl targets |
| 3 | 8 | ||
| @@ -7,6 +12,21 @@ upstream given that elfutils has been closely tied to glibc | |||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 8 | Upstream-Status: Inappropriate [workaround for musl] | 13 | Upstream-Status: Inappropriate [workaround for musl] |
| 9 | 14 | ||
| 15 | Rebase to 0.177 | ||
| 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 17 | --- | ||
| 18 | lib/error.h | 27 +++++++++++++++++++++++++++ | ||
| 19 | lib/fixedsizehash.h | 1 - | ||
| 20 | lib/libeu.h | 1 + | ||
| 21 | libdwfl/dwfl_error.c | 9 +++++++++ | ||
| 22 | libdwfl/linux-kernel-modules.c | 1 + | ||
| 23 | libelf/elf.h | 9 ++++++--- | ||
| 24 | 6 files changed, 44 insertions(+), 4 deletions(-) | ||
| 25 | create mode 100644 lib/error.h | ||
| 26 | |||
| 27 | diff --git a/lib/error.h b/lib/error.h | ||
| 28 | new file mode 100644 | ||
| 29 | index 0000000..ef06827 | ||
| 10 | --- /dev/null | 30 | --- /dev/null |
| 11 | +++ b/lib/error.h | 31 | +++ b/lib/error.h |
| 12 | @@ -0,0 +1,27 @@ | 32 | @@ -0,0 +1,27 @@ |
| @@ -37,6 +57,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 37 | +} | 57 | +} |
| 38 | + | 58 | + |
| 39 | +#endif /* _ERROR_H_ */ | 59 | +#endif /* _ERROR_H_ */ |
| 60 | diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h | ||
| 61 | index dac2a5f..43016fc 100644 | ||
| 40 | --- a/lib/fixedsizehash.h | 62 | --- a/lib/fixedsizehash.h |
| 41 | +++ b/lib/fixedsizehash.h | 63 | +++ b/lib/fixedsizehash.h |
| 42 | @@ -30,7 +30,6 @@ | 64 | @@ -30,7 +30,6 @@ |
| @@ -47,6 +69,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 47 | 69 | ||
| 48 | #include <system.h> | 70 | #include <system.h> |
| 49 | 71 | ||
| 72 | diff --git a/lib/libeu.h b/lib/libeu.h | ||
| 73 | index ecb4d01..edc85e3 100644 | ||
| 50 | --- a/lib/libeu.h | 74 | --- a/lib/libeu.h |
| 51 | +++ b/lib/libeu.h | 75 | +++ b/lib/libeu.h |
| 52 | @@ -29,6 +29,7 @@ | 76 | @@ -29,6 +29,7 @@ |
| @@ -57,6 +81,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 57 | #include <stddef.h> | 81 | #include <stddef.h> |
| 58 | #include <stdint.h> | 82 | #include <stdint.h> |
| 59 | 83 | ||
| 84 | diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c | ||
| 85 | index 7bcf61c..11dcc8b 100644 | ||
| 60 | --- a/libdwfl/dwfl_error.c | 86 | --- a/libdwfl/dwfl_error.c |
| 61 | +++ b/libdwfl/dwfl_error.c | 87 | +++ b/libdwfl/dwfl_error.c |
| 62 | @@ -154,7 +154,16 @@ dwfl_errmsg (int error) | 88 | @@ -154,7 +154,16 @@ dwfl_errmsg (int error) |
| @@ -76,6 +102,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 76 | case OTHER_ERROR (LIBELF): | 102 | case OTHER_ERROR (LIBELF): |
| 77 | return elf_errmsg (error & 0xffff); | 103 | return elf_errmsg (error & 0xffff); |
| 78 | case OTHER_ERROR (LIBDW): | 104 | case OTHER_ERROR (LIBDW): |
| 105 | diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c | ||
| 106 | index d46ab5a..1c3faee 100644 | ||
| 79 | --- a/libdwfl/linux-kernel-modules.c | 107 | --- a/libdwfl/linux-kernel-modules.c |
| 80 | +++ b/libdwfl/linux-kernel-modules.c | 108 | +++ b/libdwfl/linux-kernel-modules.c |
| 81 | @@ -50,6 +50,7 @@ | 109 | @@ -50,6 +50,7 @@ |
| @@ -86,6 +114,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 86 | 114 | ||
| 87 | /* If fts.h is included before config.h, its indirect inclusions may not | 115 | /* If fts.h is included before config.h, its indirect inclusions may not |
| 88 | give us the right LFS aliases of these functions, so map them manually. */ | 116 | give us the right LFS aliases of these functions, so map them manually. */ |
| 117 | diff --git a/libelf/elf.h b/libelf/elf.h | ||
| 118 | index bed273d..be228e6 100644 | ||
| 89 | --- a/libelf/elf.h | 119 | --- a/libelf/elf.h |
| 90 | +++ b/libelf/elf.h | 120 | +++ b/libelf/elf.h |
| 91 | @@ -21,7 +21,9 @@ | 121 | @@ -21,7 +21,9 @@ |
| @@ -99,9 +129,9 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 99 | 129 | ||
| 100 | /* Standard ELF types. */ | 130 | /* Standard ELF types. */ |
| 101 | 131 | ||
| 102 | @@ -3937,6 +3939,7 @@ enum | 132 | @@ -4029,6 +4031,7 @@ enum |
| 103 | #define R_METAG_TLS_LE_HI16 60 | 133 | #define R_NDS32_TLS_TPOFF 102 |
| 104 | #define R_METAG_TLS_LE_LO16 61 | 134 | #define R_NDS32_TLS_DESC 119 |
| 105 | 135 | ||
| 106 | -__END_DECLS | 136 | -__END_DECLS |
| 107 | - | 137 | - |
| @@ -109,3 +139,6 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
| 109 | +} | 139 | +} |
| 110 | +#endif | 140 | +#endif |
| 111 | #endif /* elf.h */ | 141 | #endif /* elf.h */ |
| 142 | -- | ||
| 143 | 2.7.4 | ||
| 144 | |||
