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-utils.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-utils.patch')
-rw-r--r-- | meta/recipes-devtools/elfutils/files/musl-utils.patch | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/meta/recipes-devtools/elfutils/files/musl-utils.patch b/meta/recipes-devtools/elfutils/files/musl-utils.patch index 8e636bf660..a8ad931236 100644 --- a/meta/recipes-devtools/elfutils/files/musl-utils.patch +++ b/meta/recipes-devtools/elfutils/files/musl-utils.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 7f5e2fd86d54e0a4d195ec65afb9b411829dff9f Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 23 Aug 2019 10:19:48 +0800 | ||
4 | Subject: [PATCH 3/3] musl-utils | ||
5 | |||
1 | Provide missing defines which otherwise are available on glibc system headers | 6 | Provide missing defines which otherwise are available on glibc system headers |
2 | 7 | ||
3 | Alter the error API to match posix version | 8 | Alter the error API to match posix version |
@@ -5,6 +10,19 @@ use qsort instead of qsort_r which is glibc specific API | |||
5 | 10 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | Upstream-Status: Inappropriate [workaround for musl] | 12 | Upstream-Status: Inappropriate [workaround for musl] |
13 | |||
14 | Rebase to 0.177 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | src/arlib.h | 6 ++++++ | ||
18 | src/elfcompress.c | 7 +++++++ | ||
19 | src/readelf.c | 20 ++++++++++++-------- | ||
20 | src/strip.c | 7 +++++++ | ||
21 | src/unstrip.c | 9 +++++++++ | ||
22 | 5 files changed, 41 insertions(+), 8 deletions(-) | ||
23 | |||
24 | diff --git a/src/arlib.h b/src/arlib.h | ||
25 | index e117166..8326f6c 100644 | ||
8 | --- a/src/arlib.h | 26 | --- a/src/arlib.h |
9 | +++ b/src/arlib.h | 27 | +++ b/src/arlib.h |
10 | @@ -29,6 +29,12 @@ | 28 | @@ -29,6 +29,12 @@ |
@@ -20,6 +38,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
20 | 38 | ||
21 | /* State of -D/-U flags. */ | 39 | /* State of -D/-U flags. */ |
22 | extern bool arlib_deterministic_output; | 40 | extern bool arlib_deterministic_output; |
41 | diff --git a/src/elfcompress.c b/src/elfcompress.c | ||
42 | index 6ba6af4..0c7674b 100644 | ||
23 | --- a/src/elfcompress.c | 43 | --- a/src/elfcompress.c |
24 | +++ b/src/elfcompress.c | 44 | +++ b/src/elfcompress.c |
25 | @@ -37,6 +37,13 @@ | 45 | @@ -37,6 +37,13 @@ |
@@ -36,9 +56,11 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
36 | /* Name and version of program. */ | 56 | /* Name and version of program. */ |
37 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; | 57 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; |
38 | 58 | ||
59 | diff --git a/src/readelf.c b/src/readelf.c | ||
60 | index 5c02a9b..817562d 100644 | ||
39 | --- a/src/readelf.c | 61 | --- a/src/readelf.c |
40 | +++ b/src/readelf.c | 62 | +++ b/src/readelf.c |
41 | @@ -4792,10 +4792,11 @@ listptr_base (struct listptr *p) | 63 | @@ -4813,10 +4813,11 @@ listptr_base (struct listptr *p) |
42 | return cudie_base (&cu); | 64 | return cudie_base (&cu); |
43 | } | 65 | } |
44 | 66 | ||
@@ -52,7 +74,7 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
52 | struct listptr *p1 = (void *) a; | 74 | struct listptr *p1 = (void *) a; |
53 | struct listptr *p2 = (void *) b; | 75 | struct listptr *p2 = (void *) b; |
54 | 76 | ||
55 | @@ -4811,21 +4812,21 @@ compare_listptr (const void *a, const vo | 77 | @@ -4832,21 +4833,21 @@ compare_listptr (const void *a, const void *b, void *arg) |
56 | p1->warned = p2->warned = true; | 78 | p1->warned = p2->warned = true; |
57 | error (0, 0, | 79 | error (0, 0, |
58 | gettext ("%s %#" PRIx64 " used with different address sizes"), | 80 | gettext ("%s %#" PRIx64 " used with different address sizes"), |
@@ -77,7 +99,7 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
77 | } | 99 | } |
78 | if (p1->attr != p2 ->attr) | 100 | if (p1->attr != p2 ->attr) |
79 | { | 101 | { |
80 | @@ -4833,7 +4834,7 @@ compare_listptr (const void *a, const vo | 102 | @@ -4854,7 +4855,7 @@ compare_listptr (const void *a, const void *b, void *arg) |
81 | error (0, 0, | 103 | error (0, 0, |
82 | gettext ("%s %#" PRIx64 | 104 | gettext ("%s %#" PRIx64 |
83 | " used with different attribute %s and %s"), | 105 | " used with different attribute %s and %s"), |
@@ -86,7 +108,7 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
86 | dwarf_attr_name (p2->attr)); | 108 | dwarf_attr_name (p2->attr)); |
87 | } | 109 | } |
88 | } | 110 | } |
89 | @@ -4905,8 +4906,11 @@ static void | 111 | @@ -4926,8 +4927,11 @@ static void |
90 | sort_listptr (struct listptr_table *table, const char *name) | 112 | sort_listptr (struct listptr_table *table, const char *name) |
91 | { | 113 | { |
92 | if (table->n > 0) | 114 | if (table->n > 0) |
@@ -100,6 +122,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
100 | } | 122 | } |
101 | 123 | ||
102 | static bool | 124 | static bool |
125 | diff --git a/src/strip.c b/src/strip.c | ||
126 | index 4054c2a..d2d2176 100644 | ||
103 | --- a/src/strip.c | 127 | --- a/src/strip.c |
104 | +++ b/src/strip.c | 128 | +++ b/src/strip.c |
105 | @@ -46,6 +46,13 @@ | 129 | @@ -46,6 +46,13 @@ |
@@ -116,6 +140,8 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
116 | typedef uint8_t GElf_Byte; | 140 | typedef uint8_t GElf_Byte; |
117 | 141 | ||
118 | /* Name and version of program. */ | 142 | /* Name and version of program. */ |
143 | diff --git a/src/unstrip.c b/src/unstrip.c | ||
144 | index fc87832..21ea6b3 100644 | ||
119 | --- a/src/unstrip.c | 145 | --- a/src/unstrip.c |
120 | +++ b/src/unstrip.c | 146 | +++ b/src/unstrip.c |
121 | @@ -56,6 +56,15 @@ | 147 | @@ -56,6 +56,15 @@ |
@@ -134,3 +160,6 @@ Upstream-Status: Inappropriate [workaround for musl] | |||
134 | /* Name and version of program. */ | 160 | /* Name and version of program. */ |
135 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; | 161 | ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; |
136 | 162 | ||
163 | -- | ||
164 | 2.7.4 | ||
165 | |||