summaryrefslogtreecommitdiff
path: root/experimental/elfutils/musl-qsort_r.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-07-18 06:15:43 -0400
committerMax Rees <maxcrees@me.com>2019-08-07 18:07:49 -0500
commit420a64fe15922629a54e7d38cdedbf1fc86ee8ff (patch)
tree2b526e9b9426734eff19ca295dd42a91f37811a1 /experimental/elfutils/musl-qsort_r.patch
parent17ca3641eaad94f05d1c9f66593c67e425268050 (diff)
downloadpackages-420a64fe15922629a54e7d38cdedbf1fc86ee8ff.tar.gz
packages-420a64fe15922629a54e7d38cdedbf1fc86ee8ff.tar.bz2
packages-420a64fe15922629a54e7d38cdedbf1fc86ee8ff.tar.xz
packages-420a64fe15922629a54e7d38cdedbf1fc86ee8ff.zip
experimental/elfutils: new package
Diffstat (limited to 'experimental/elfutils/musl-qsort_r.patch')
-rw-r--r--experimental/elfutils/musl-qsort_r.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/experimental/elfutils/musl-qsort_r.patch b/experimental/elfutils/musl-qsort_r.patch
new file mode 100644
index 000000000..9be21bd25
--- /dev/null
+++ b/experimental/elfutils/musl-qsort_r.patch
@@ -0,0 +1,65 @@
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p)
+ return cudie_base (&cu);
+ }
+
++static const char *listptr_name;
++
+ static int
+-compare_listptr (const void *a, const void *b, void *arg)
++compare_listptr (const void *a, const void *b)
+ {
+- const char *name = arg;
+ struct listptr *p1 = (void *) a;
+ struct listptr *p2 = (void *) b;
+
+@@ -4792,21 +4793,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"),
+- name, (uint64_t) p1->offset);
++ listptr_name, (uint64_t) p1->offset);
+ }
+ if (p1->dwarf64 != p2->dwarf64)
+ {
+ p1->warned = p2->warned = true;
+ error (0, 0,
+ gettext ("%s %#" PRIx64 " used with different offset sizes"),
+- name, (uint64_t) p1->offset);
++ listptr_name, (uint64_t) p1->offset);
+ }
+ if (listptr_base (p1) != listptr_base (p2))
+ {
+ p1->warned = p2->warned = true;
+ error (0, 0,
+ gettext ("%s %#" PRIx64 " used with different base addresses"),
+- name, (uint64_t) p1->offset);
++ listptr_name, (uint64_t) p1->offset);
+ }
+ if (p1->attr != p2 ->attr)
+ {
+@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg)
+ error (0, 0,
+ gettext ("%s %#" PRIx64
+ " used with different attribute %s and %s"),
+- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
++ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
+ dwarf_attr_name (p2->attr));
+ }
+ }
+@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
+ static void
+ sort_listptr (struct listptr_table *table, const char *name)
+ {
+- if (table->n > 0)
+- qsort_r (table->table, table->n, sizeof table->table[0],
+- &compare_listptr, (void *) name);
++ if (table->n > 0) {
++ listptr_name = name;
++ qsort (table->table, table->n, sizeof table->table[0],
++ &compare_listptr);
++ }
+ }
+
+ static bool