diff options
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 @@ +From 7f5e2fd86d54e0a4d195ec65afb9b411829dff9f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 23 Aug 2019 10:19:48 +0800 +Subject: [PATCH 3/3] musl-utils + Provide missing defines which otherwise are available on glibc system headers Alter the error API to match posix version @@ -5,6 +10,19 @@ use qsort instead of qsort_r which is glibc specific API 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> +--- + src/arlib.h | 6 ++++++ + src/elfcompress.c | 7 +++++++ + src/readelf.c | 20 ++++++++++++-------- + src/strip.c | 7 +++++++ + src/unstrip.c | 9 +++++++++ + 5 files changed, 41 insertions(+), 8 deletions(-) + +diff --git a/src/arlib.h b/src/arlib.h +index e117166..8326f6c 100644 --- a/src/arlib.h +++ b/src/arlib.h @@ -29,6 +29,12 @@ @@ -20,6 +38,8 @@ Upstream-Status: Inappropriate [workaround for musl] /* State of -D/-U flags. */ extern bool arlib_deterministic_output; +diff --git a/src/elfcompress.c b/src/elfcompress.c +index 6ba6af4..0c7674b 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -37,6 +37,13 @@ @@ -36,9 +56,11 @@ Upstream-Status: Inappropriate [workaround for musl] /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; +diff --git a/src/readelf.c b/src/readelf.c +index 5c02a9b..817562d 100644 --- a/src/readelf.c +++ b/src/readelf.c -@@ -4792,10 +4792,11 @@ listptr_base (struct listptr *p) +@@ -4813,10 +4813,11 @@ listptr_base (struct listptr *p) return cudie_base (&cu); } @@ -52,7 +74,7 @@ Upstream-Status: Inappropriate [workaround for musl] struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4811,21 +4812,21 @@ compare_listptr (const void *a, const vo +@@ -4832,21 +4833,21 @@ compare_listptr (const void *a, const void *b, void *arg) p1->warned = p2->warned = true; error (0, 0, gettext ("%s %#" PRIx64 " used with different address sizes"), @@ -77,7 +99,7 @@ Upstream-Status: Inappropriate [workaround for musl] } if (p1->attr != p2 ->attr) { -@@ -4833,7 +4834,7 @@ compare_listptr (const void *a, const vo +@@ -4854,7 +4855,7 @@ compare_listptr (const void *a, const void *b, void *arg) error (0, 0, gettext ("%s %#" PRIx64 " used with different attribute %s and %s"), @@ -86,7 +108,7 @@ Upstream-Status: Inappropriate [workaround for musl] dwarf_attr_name (p2->attr)); } } -@@ -4905,8 +4906,11 @@ static void +@@ -4926,8 +4927,11 @@ static void sort_listptr (struct listptr_table *table, const char *name) { if (table->n > 0) @@ -100,6 +122,8 @@ Upstream-Status: Inappropriate [workaround for musl] } static bool +diff --git a/src/strip.c b/src/strip.c +index 4054c2a..d2d2176 100644 --- a/src/strip.c +++ b/src/strip.c @@ -46,6 +46,13 @@ @@ -116,6 +140,8 @@ Upstream-Status: Inappropriate [workaround for musl] typedef uint8_t GElf_Byte; /* Name and version of program. */ +diff --git a/src/unstrip.c b/src/unstrip.c +index fc87832..21ea6b3 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -56,6 +56,15 @@ @@ -134,3 +160,6 @@ Upstream-Status: Inappropriate [workaround for musl] /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; +-- +2.7.4 + |