summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-28 16:36:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-02 14:15:33 +0000
commitecabf7386fce5f1af93215b7c3b47291e4d63cb3 (patch)
tree27004da0c3f1a239b0cb0be06bbc834c080d85f7 /meta
parentf33d697fa6e234043aaac4018f53e3259375b59e (diff)
downloadpoky-ecabf7386fce5f1af93215b7c3b47291e4d63cb3.tar.gz
elfutils: update 0.182 -> 0.183
Drop 0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch Drop 0001-musl-obstack-fts.patch (upstream has fixed the issues). Drop a few other chunks where upstream has fixed the issues or removed the code being patched. Adjust ptests to pass again. (From OE-Core rev: d358212bb557c99b266a0022ce973782c8c4d260) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.183.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.182.bb)8
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch7
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch8
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch124
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch32
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch24
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch6
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-musl-libs.patch30
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch6
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-musl-utils.patch91
-rw-r--r--meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch12
-rw-r--r--meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch2
-rw-r--r--meta/recipes-devtools/elfutils/files/ptest.patch61
-rw-r--r--meta/recipes-devtools/elfutils/files/run-ptest2
19 files changed, 85 insertions, 342 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.182.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
index 1123a34bfe..16ed7c9ddb 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.182.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
@@ -19,20 +19,18 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
19 file://0001-libasm-may-link-with-libbz2-if-found.patch \ 19 file://0001-libasm-may-link-with-libbz2-if-found.patch \
20 file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ 20 file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
21 file://0001-skip-the-test-when-gcc-not-deployed.patch \ 21 file://0001-skip-the-test-when-gcc-not-deployed.patch \
22 file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
23 file://run-ptest \ 22 file://run-ptest \
24 file://ptest.patch \ 23 file://ptest.patch \
25 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ 24 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
26 file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ 25 file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \
27 " 26 "
28SRC_URI_append_libc-musl = " \ 27SRC_URI_append_libc-musl = " \
29 file://0001-musl-obstack-fts.patch \
30 file://0002-musl-libs.patch \ 28 file://0002-musl-libs.patch \
31 file://0003-musl-utils.patch \ 29 file://0003-musl-utils.patch \
32 file://0004-Fix-error-on-musl.patch \ 30 file://0004-Fix-error-on-musl.patch \
33 file://0015-config-eu.am-do-not-use-Werror.patch \ 31 file://0015-config-eu.am-do-not-use-Werror.patch \
34 " 32 "
35SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858" 33SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5"
36 34
37inherit autotools gettext ptest pkgconfig 35inherit autotools gettext ptest pkgconfig
38 36
@@ -68,6 +66,8 @@ do_install_ptest() {
68 install -d -m 755 ${D}${PTEST_PATH}/libdwfl 66 install -d -m 755 ${D}${PTEST_PATH}/libdwfl
69 install -d -m 755 ${D}${PTEST_PATH}/libdwelf 67 install -d -m 755 ${D}${PTEST_PATH}/libdwelf
70 install -d -m 755 ${D}${PTEST_PATH}/libasm 68 install -d -m 755 ${D}${PTEST_PATH}/libasm
69 install -d -m 755 ${D}${PTEST_PATH}/libcpu
70 install -d -m 755 ${D}${PTEST_PATH}/libebl
71 for test_file in ${TEST_FILES}; do 71 for test_file in ${TEST_FILES}; do
72 if [ -f ${B}/src/${test_file} ]; then 72 if [ -f ${B}/src/${test_file} ]; then
73 cp -r ${B}/src/${test_file} ${D}${PTEST_PATH}/src 73 cp -r ${B}/src/${test_file} ${D}${PTEST_PATH}/src
@@ -76,6 +76,8 @@ do_install_ptest() {
76 cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so 76 cp ${D}${libdir}/libelf-${PV}.so ${D}${PTEST_PATH}/libelf/libelf.so
77 cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so 77 cp ${D}${libdir}/libdw-${PV}.so ${D}${PTEST_PATH}/libdw/libdw.so
78 cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so 78 cp ${D}${libdir}/libasm-${PV}.so ${D}${PTEST_PATH}/libasm/libasm.so
79 cp ${B}/libcpu/libcpu.a ${D}${PTEST_PATH}/libcpu/
80 cp ${B}/libebl/libebl.a ${D}${PTEST_PATH}/libebl/
79 cp ${S}/libelf/*.h ${D}${PTEST_PATH}/libelf/ 81 cp ${S}/libelf/*.h ${D}${PTEST_PATH}/libelf/
80 cp ${S}/libdw/*.h ${D}${PTEST_PATH}/libdw/ 82 cp ${S}/libdw/*.h ${D}${PTEST_PATH}/libdw/
81 cp ${S}/libdwfl/*.h ${D}${PTEST_PATH}/libdwfl/ 83 cp ${S}/libdwfl/*.h ${D}${PTEST_PATH}/libdwfl/
diff --git a/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch b/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
index f15eacbe72..5f82afef0c 100644
--- a/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-add-support-for-ipkg-to-debuginfod.cxx.patch
@@ -1,4 +1,4 @@
1From b647d1df55c20772a9cc7ce96fcf323c500481bf Mon Sep 17 00:00:00 2001 1From 571416bf5b5ef319df6d9c79e46680920487e4a7 Mon Sep 17 00:00:00 2001
2From: dorindabassey <dorindabassey@gmail.com> 2From: dorindabassey <dorindabassey@gmail.com>
3Date: Sat, 19 Dec 2020 01:11:46 +0100 3Date: Sat, 19 Dec 2020 01:11:46 +0100
4Subject: [PATCH] add support for ipkg to debuginfod.cxx 4Subject: [PATCH] add support for ipkg to debuginfod.cxx
@@ -8,15 +8,16 @@ added support for ipkg to the debuginfod scanner. 0.182 only supports RPM and sc
8Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html] 8Upstream-status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2020q4/003357.html]
9 9
10Signed-off-by: dorindabassey <dorindabassey@gmail.com> 10Signed-off-by: dorindabassey <dorindabassey@gmail.com>
11
11--- 12---
12 debuginfod/debuginfod.cxx | 2 ++ 13 debuginfod/debuginfod.cxx | 2 ++
13 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
14 15
15diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx 16diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
16index 5621030..cc78c93 100644 17index b34eacc..a8915f2 100644
17--- a/debuginfod/debuginfod.cxx 18--- a/debuginfod/debuginfod.cxx
18+++ b/debuginfod/debuginfod.cxx 19+++ b/debuginfod/debuginfod.cxx
19@@ -442,11 +442,13 @@ parse_opt (int key, char *arg, 20@@ -484,11 +484,13 @@ parse_opt (int key, char *arg,
20 { 21 {
21 scan_archives[".deb"]="dpkg-deb --fsys-tarfile"; 22 scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
22 scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile"; 23 scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
index 62031073e3..6acc036406 100644
--- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
@@ -1,4 +1,4 @@
1From ec9a7742734aae5417c0ebbffce66ac353e6cae7 Mon Sep 17 00:00:00 2001 1From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:10:57 +0800 3Date: Tue, 15 Aug 2017 17:10:57 +0800
4Subject: [PATCH] dso link change 4Subject: [PATCH] dso link change
@@ -23,7 +23,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
23 2 files changed, 2 insertions(+), 2 deletions(-) 23 2 files changed, 2 insertions(+), 2 deletions(-)
24 24
25diff --git a/src/Makefile.am b/src/Makefile.am 25diff --git a/src/Makefile.am b/src/Makefile.am
26index e462e7d..ea1215b 100644 26index 88d0ac8..c28d81f 100644
27--- a/src/Makefile.am 27--- a/src/Makefile.am
28+++ b/src/Makefile.am 28+++ b/src/Makefile.am
29@@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread 29@@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
@@ -36,10 +36,10 @@ index e462e7d..ea1215b 100644
36 endif 36 endif
37 libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a 37 libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
38diff --git a/tests/Makefile.am b/tests/Makefile.am 38diff --git a/tests/Makefile.am b/tests/Makefile.am
39index eab4ae6..f59a01f 100644 39index c145720..72afd0e 100644
40--- a/tests/Makefile.am 40--- a/tests/Makefile.am
41+++ b/tests/Makefile.am 41+++ b/tests/Makefile.am
42@@ -516,7 +516,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread 42@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
43 libelf = ../libelf/libelf.a -lz 43 libelf = ../libelf/libelf.a -lz
44 libasm = ../libasm/libasm.a 44 libasm = ../libasm/libasm.a
45 else 45 else
diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
index 73ead6d412..09c9d3ea24 100644
--- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
@@ -1,4 +1,4 @@
1From 8e5fff8b1d819e0870fb22b27950bb5f10c7a272 Mon Sep 17 00:00:00 2001 1From ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Oct 2017 22:30:46 -0700 3Date: Wed, 4 Oct 2017 22:30:46 -0700
4Subject: [PATCH] libasm may link with libbz2 if found 4Subject: [PATCH] libasm may link with libbz2 if found
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/src/Makefile.am b/src/Makefile.am 19diff --git a/src/Makefile.am b/src/Makefile.am
20index ea1215b..13d9bda 100644 20index c28d81f..951e978 100644
21--- a/src/Makefile.am 21--- a/src/Makefile.am
22+++ b/src/Makefile.am 22+++ b/src/Makefile.am
23@@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in 23@@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in
diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch
index b26ed99f65..c8d55d583a 100644
--- a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch
@@ -1,4 +1,4 @@
1From e571cbd0c20085ec71969971f19280b5de95cfb7 Mon Sep 17 00:00:00 2001 1From f40cbd43acdb1fefef4fa53a6034296d83cbff7d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 16 Aug 2018 09:58:26 +0800 3Date: Thu, 16 Aug 2018 09:58:26 +0800
4Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it 4Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it
diff --git a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch b/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch
deleted file mode 100644
index ca7caf08d8..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch
+++ /dev/null
@@ -1,124 +0,0 @@
1From dbaa05a519acfe4f6040784f5d4a28ca586c0fc4 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:17:25 +0800
4Subject: [PATCH] musl-obstack-fts
5
6Look for libfts and libobstack during configure, these
7libraries are external to libc when using musl, whereas
8on glibc these libraries are provided in libc itself.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Inappropriate [workaround for musl]
12
13Rebase to 0.177
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15
16---
17 configure.ac | 54 +++++++++++++++++++++++++++++++++++++++++++++++
18 libdw/Makefile.am | 2 +-
19 src/Makefile.am | 6 +++---
20 3 files changed, 58 insertions(+), 4 deletions(-)
21
22diff --git a/configure.ac b/configure.ac
23index 53bab6a..dfea85e 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -539,6 +539,60 @@ else
27 fi
28 AC_SUBST([argp_LDADD])
29
30+dnl Check if we have fts available from our libc
31+AC_LINK_IFELSE(
32+ [AC_LANG_PROGRAM(
33+ [#if !defined(__x86_64__)
34+ #undef _FILE_OFFSET_BITS
35+ #define _FILE_OFFSET_BITS 32
36+ #endif
37+ #include <fts.h>],
38+ [FTS* fts = 0; return fts_close(fts); return 0;]
39+ )],
40+ [libc_has_fts="true"],
41+ [libc_has_fts="false"]
42+)
43+
44+dnl If our libc doesn't provide fts, then test for libfts
45+if test "$libc_has_fts" = "false" ; then
46+ AC_MSG_WARN("libc does not have fts")
47+ AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
48+
49+ if test "$have_fts" = "false"; then
50+ AC_MSG_ERROR("no libfts found")
51+ else
52+ fts_LDADD="-lfts"
53+ fi
54+else
55+ fts_LDADD=""
56+fi
57+AC_SUBST([fts_LDADD])
58+
59+dnl Check if we have obstack available from our libc
60+AC_LINK_IFELSE(
61+ [AC_LANG_PROGRAM(
62+ [#include <obstack.h>],
63+ [_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
64+ )],
65+ [libc_has_obstack="true"],
66+ [libc_has_obstack="false"]
67+)
68+
69+dnl If our libc doesn't provide obstack, then test for libobstack
70+if test "$libc_has_obstack" = "false" ; then
71+ AC_MSG_WARN("libc does not have obstack")
72+ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
73+
74+ if test "$have_obstack" = "false"; then
75+ AC_MSG_ERROR("no libobstack found")
76+ else
77+ obstack_LDADD="-lobstack"
78+ fi
79+else
80+ obstack_LDADD=""
81+fi
82+AC_SUBST([obstack_LDADD])
83+
84 dnl The directories with content.
85
86 dnl Documentation.
87diff --git a/libdw/Makefile.am b/libdw/Makefile.am
88index 33b5838..ff92e02 100644
89--- a/libdw/Makefile.am
90+++ b/libdw/Makefile.am
91@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \
92 ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
93 ../libdwfl/libdwfl_pic.a
94 libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
95-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
96+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(zip_LIBS) -pthread
97 libdw_so_SOURCES =
98 libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
99 $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
100diff --git a/src/Makefile.am b/src/Makefile.am
101index 13d9bda..d5a4f7d 100644
102--- a/src/Makefile.am
103+++ b/src/Makefile.am
104@@ -69,7 +69,7 @@ ar_no_Wstack_usage = yes
105 unstrip_no_Wstack_usage = yes
106
107 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
108-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \
109+nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD) \
110 $(demanglelib)
111 size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
112 strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
113@@ -78,9 +78,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
114 addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
115 elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
116 objdump_LDADD = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
117-ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
118+ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD)
119 strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
120-ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
121+ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LDADD)
122 unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
123 stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
124 elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
diff --git a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
deleted file mode 100644
index 3303333c45..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 8 Sep 2019 15:57:59 -0700
4Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
5
6Fixes
7| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type
8| struct pt_regs r;
9| ^
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 backends/ppc_initreg.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
19index 0e0d359..e5cca7e 100644
20--- a/backends/ppc_initreg.c
21+++ b/backends/ppc_initreg.c
22@@ -33,6 +33,7 @@
23 #include <stdlib.h>
24 #if defined(__powerpc__) && defined(__linux__)
25 # include <sys/ptrace.h>
26+# include <asm/ptrace.h>
27 # include <sys/user.h>
28 #endif
29
30--
312.23.0
32
diff --git a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
index de8c05f11e..114ca63cb5 100644
--- a/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
@@ -1,7 +1,7 @@
1From e82a055f85e398cb03a4eaf5faf351a3a1f19344 Mon Sep 17 00:00:00 2001 1From 2fa52d61b1abdf4a3f3b153c771fb2081666430c Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com> 2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Tue, 21 May 2019 15:20:34 +0800 3Date: Tue, 21 May 2019 15:20:34 +0800
4Subject: [PATCH v2] skip the test when gcc not deployed 4Subject: [PATCH] skip the test when gcc not deployed
5 5
6Skip the tests which depend on gcc when 6Skip the tests which depend on gcc when
7gcc not deployed. 7gcc not deployed.
@@ -9,6 +9,7 @@ gcc not deployed.
9Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html] 9Upstream-Status: Submitted[https://sourceware.org/ml/elfutils-devel/2019-q2/msg00091.html]
10 10
11Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 11Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
12
12--- 13---
13 tests/run-disasm-x86-64.sh | 2 ++ 14 tests/run-disasm-x86-64.sh | 2 ++
14 tests/run-disasm-x86.sh | 2 ++ 15 tests/run-disasm-x86.sh | 2 ++
@@ -17,7 +18,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
17 4 files changed, 8 insertions(+) 18 4 files changed, 8 insertions(+)
18 19
19diff --git a/tests/run-disasm-x86-64.sh b/tests/run-disasm-x86-64.sh 20diff --git a/tests/run-disasm-x86-64.sh b/tests/run-disasm-x86-64.sh
20index a6be62b..c3ef238 100755 21index 07b612b..7a32996 100755
21--- a/tests/run-disasm-x86-64.sh 22--- a/tests/run-disasm-x86-64.sh
22+++ b/tests/run-disasm-x86-64.sh 23+++ b/tests/run-disasm-x86-64.sh
23@@ -22,6 +22,8 @@ case "`uname -m`" in 24@@ -22,6 +22,8 @@ case "`uname -m`" in
@@ -26,11 +27,11 @@ index a6be62b..c3ef238 100755
26 testfiles testfile45.S testfile45.expect 27 testfiles testfile45.S testfile45.expect
27+ # skip the case if no gcc deployed 28+ # skip the case if no gcc deployed
28+ which gcc || exit 77 29+ which gcc || exit 77
29 gcc -m64 -c -o testfile45.o testfile45.S 30 ${CC} -m64 -c -o testfile45.o testfile45.S
30 testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect 31 testrun_compare ${abs_top_builddir}/src/objdump -d testfile45.o < testfile45.expect
31 ;; 32 ;;
32diff --git a/tests/run-disasm-x86.sh b/tests/run-disasm-x86.sh 33diff --git a/tests/run-disasm-x86.sh b/tests/run-disasm-x86.sh
33index 28a3df7..544fc28 100755 34index 7ac73ad..f0d4796 100755
34--- a/tests/run-disasm-x86.sh 35--- a/tests/run-disasm-x86.sh
35+++ b/tests/run-disasm-x86.sh 36+++ b/tests/run-disasm-x86.sh
36@@ -22,6 +22,8 @@ case "`uname -m`" in 37@@ -22,6 +22,8 @@ case "`uname -m`" in
@@ -39,11 +40,11 @@ index 28a3df7..544fc28 100755
39 testfiles testfile44.S testfile44.expect 40 testfiles testfile44.S testfile44.expect
40+ # skip the case if no gcc deployed 41+ # skip the case if no gcc deployed
41+ which gcc || exit 77 42+ which gcc || exit 77
42 gcc -m32 -c -o testfile44.o testfile44.S 43 ${CC} -m32 -c -o testfile44.o testfile44.S
43 testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect 44 testrun_compare ${abs_top_builddir}/src/objdump -d testfile44.o < testfile44.expect
44 ;; 45 ;;
45diff --git a/tests/run-strip-g.sh b/tests/run-strip-g.sh 46diff --git a/tests/run-strip-g.sh b/tests/run-strip-g.sh
46index 1303819..a943dec 100755 47index 1592121..9b8157e 100755
47--- a/tests/run-strip-g.sh 48--- a/tests/run-strip-g.sh
48+++ b/tests/run-strip-g.sh 49+++ b/tests/run-strip-g.sh
49@@ -24,6 +24,8 @@ 50@@ -24,6 +24,8 @@
@@ -53,10 +54,10 @@ index 1303819..a943dec 100755
53+# skip the test if gcc deployed 54+# skip the test if gcc deployed
54+which gcc || exit 77 55+which gcc || exit 77
55 echo Create debug a.out. 56 echo Create debug a.out.
56 echo "int main() { return 1; }" | gcc -g -xc - 57 echo "int main() { return 1; }" | ${CC} -g -xc -
57 58
58diff --git a/tests/run-strip-nothing.sh b/tests/run-strip-nothing.sh 59diff --git a/tests/run-strip-nothing.sh b/tests/run-strip-nothing.sh
59index 914fdfb..d03f734 100755 60index 710c200..3a81d8e 100755
60--- a/tests/run-strip-nothing.sh 61--- a/tests/run-strip-nothing.sh
61+++ b/tests/run-strip-nothing.sh 62+++ b/tests/run-strip-nothing.sh
62@@ -22,6 +22,8 @@ 63@@ -22,6 +22,8 @@
@@ -66,8 +67,5 @@ index 914fdfb..d03f734 100755
66+# skip the case if no gcc deployed 67+# skip the case if no gcc deployed
67+which gcc || exit 77 68+which gcc || exit 77
68 # Create no-debug a.out. 69 # Create no-debug a.out.
69 echo "int main() { return 1; }" | gcc -s -xc - 70 echo "int main() { return 1; }" | ${CC} -s -xc -
70 71
71--
722.7.4
73
diff --git a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch b/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch
index d7b382fd94..c494d7f2e5 100644
--- a/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch
@@ -1,4 +1,4 @@
1From fa265ff686cb60e19aa607bda3752b6b2ee87a14 Mon Sep 17 00:00:00 2001 1From 22e0e1c01ec680a2970f4d5ca9e47f90259cbdcf Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 23 Jun 2020 07:49:35 +0000 3Date: Tue, 23 Jun 2020 07:49:35 +0000
4Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS 4Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/tests/Makefile.am b/tests/Makefile.am 16diff --git a/tests/Makefile.am b/tests/Makefile.am
17index 05fc9b4..11de0fc 100644 17index a2dfd43..40a0228 100644
18--- a/tests/Makefile.am 18--- a/tests/Makefile.am
19+++ b/tests/Makefile.am 19+++ b/tests/Makefile.am
20@@ -92,7 +92,7 @@ endif 20@@ -90,7 +90,7 @@ endif
21 test-nlist$(EXEEXT): test-nlist.c 21 test-nlist$(EXEEXT): test-nlist.c
22 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 22 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
23 $(AM_CPPFLAGS) $(CPPFLAGS) \ 23 $(AM_CPPFLAGS) $(CPPFLAGS) \
diff --git a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
index 96c2565e3e..be48ef010b 100644
--- a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
+++ b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
@@ -1,4 +1,4 @@
1From f8e4118b60a9b54950437006a82b4047f38f5347 Mon Sep 17 00:00:00 2001 1From 1643d793761216252bb654e28aaa5b8eb1536bca Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:13:59 +0800 3Date: Tue, 15 Aug 2017 17:13:59 +0800
4Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same. 4Subject: [PATCH] Fix elf_cvt_gunhash if dest and src are same.
diff --git a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
index c6f766f680..b373940d37 100644
--- a/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
+++ b/meta/recipes-devtools/elfutils/files/0002-musl-libs.patch
@@ -1,4 +1,4 @@
1From f4ca9db9d38f865505322595a8a1e8f69d5bb87c Mon Sep 17 00:00:00 2001 1From 18c527991deee93170a887b6da622560d5606913 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:18:47 +0800 3Date: Fri, 23 Aug 2019 10:18:47 +0800
4Subject: [PATCH] musl-libs 4Subject: [PATCH] musl-libs
@@ -19,10 +19,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 lib/error.h | 27 +++++++++++++++++++++++++++ 19 lib/error.h | 27 +++++++++++++++++++++++++++
20 lib/fixedsizehash.h | 1 - 20 lib/fixedsizehash.h | 1 -
21 lib/libeu.h | 1 + 21 lib/libeu.h | 1 +
22 libdwfl/dwfl_error.c | 9 +++++++++
23 libdwfl/linux-kernel-modules.c | 1 + 22 libdwfl/linux-kernel-modules.c | 1 +
24 libelf/elf.h | 7 +++++++ 23 libelf/elf.h | 7 +++++++
25 6 files changed, 45 insertions(+), 1 deletion(-) 24 5 files changed, 36 insertions(+), 1 deletion(-)
26 create mode 100644 lib/error.h 25 create mode 100644 lib/error.h
27 26
28diff --git a/lib/error.h b/lib/error.h 27diff --git a/lib/error.h b/lib/error.h
@@ -82,27 +81,6 @@ index ecb4d01..edc85e3 100644
82 #include <stddef.h> 81 #include <stddef.h>
83 #include <stdint.h> 82 #include <stdint.h>
84 83
85diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
86index 7bcf61c..11dcc8b 100644
87--- a/libdwfl/dwfl_error.c
88+++ b/libdwfl/dwfl_error.c
89@@ -154,7 +154,16 @@ dwfl_errmsg (int error)
90 switch (error &~ 0xffff)
91 {
92 case OTHER_ERROR (ERRNO):
93+#if defined(__GLIBC__)
94 return strerror_r (error & 0xffff, "bad", 0);
95+#else
96+ {
97+ static __thread char buf[128] = "";
98+ if (strerror_r (error & 0xffff, buf, sizeof(buf)) == 0)
99+ return buf;
100+ }
101+ return "strerror_r() failed";
102+#endif
103 case OTHER_ERROR (LIBELF):
104 return elf_errmsg (error & 0xffff);
105 case OTHER_ERROR (LIBDW):
106diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c 84diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
107index 6edb27f..f331e3c 100644 85index 6edb27f..f331e3c 100644
108--- a/libdwfl/linux-kernel-modules.c 86--- a/libdwfl/linux-kernel-modules.c
@@ -116,7 +94,7 @@ index 6edb27f..f331e3c 100644
116 /* If fts.h is included before config.h, its indirect inclusions may not 94 /* If fts.h is included before config.h, its indirect inclusions may not
117 give us the right LFS aliases of these functions, so map them manually. */ 95 give us the right LFS aliases of these functions, so map them manually. */
118diff --git a/libelf/elf.h b/libelf/elf.h 96diff --git a/libelf/elf.h b/libelf/elf.h
119index 6439c1a..a87c589 100644 97index 8e3e618..1353890 100644
120--- a/libelf/elf.h 98--- a/libelf/elf.h
121+++ b/libelf/elf.h 99+++ b/libelf/elf.h
122@@ -19,6 +19,10 @@ 100@@ -19,6 +19,10 @@
@@ -130,7 +108,7 @@ index 6439c1a..a87c589 100644
130 /* Standard ELF types. */ 108 /* Standard ELF types. */
131 109
132 #include <stdint.h> 110 #include <stdint.h>
133@@ -4101,4 +4105,7 @@ enum 111@@ -4102,4 +4106,7 @@ enum
134 #define R_ARC_TLS_LE_S9 0x4a 112 #define R_ARC_TLS_LE_S9 0x4a
135 #define R_ARC_TLS_LE_32 0x4b 113 #define R_ARC_TLS_LE_32 0x4b
136 114
diff --git a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
index e36d3f44dd..212b358dc2 100644
--- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
@@ -1,4 +1,4 @@
1From dd7c8c730457def5f62ebd43022b2f06df8c6ed9 Mon Sep 17 00:00:00 2001 1From 7e1f91c42ef5b0bf10afefec10dd08588df3ab1f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:17:20 +0800 3Date: Tue, 15 Aug 2017 17:17:20 +0800
4Subject: [PATCH] fixheadercheck 4Subject: [PATCH] fixheadercheck
@@ -22,10 +22,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22 1 file changed, 2 insertions(+), 2 deletions(-) 22 1 file changed, 2 insertions(+), 2 deletions(-)
23 23
24diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c 24diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
25index 3e9ef61..5351518 100644 25index d0d4d1e..4ecf5a5 100644
26--- a/libelf/elf32_updatenull.c 26--- a/libelf/elf32_updatenull.c
27+++ b/libelf/elf32_updatenull.c 27+++ b/libelf/elf32_updatenull.c
28@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) 28@@ -354,8 +354,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
29 we test for the alignment of the section being large 29 we test for the alignment of the section being large
30 enough for the largest alignment required by a data 30 enough for the largest alignment required by a data
31 block. */ 31 block. */
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index a8b39b5f93..65593be32f 100644
--- a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
@@ -1,4 +1,4 @@
1From e7e5333ed2e19f25ecbd7121f424eec99d61265a Mon Sep 17 00:00:00 2001 1From 2dab1a02a3cfd80629f3e0f380805a5e58dd0ac3 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Aug 2019 10:19:48 +0800 3Date: Fri, 23 Aug 2019 10:19:48 +0800
4Subject: [PATCH] musl-utils 4Subject: [PATCH] musl-utils
@@ -15,12 +15,11 @@ Rebase to 0.177
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16 16
17--- 17---
18 src/arlib.h | 6 ++++++ 18 src/arlib.h | 6 ++++++
19 src/elfcompress.c | 7 +++++++ 19 src/elfcompress.c | 7 +++++++
20 src/readelf.c | 20 ++++++++++++-------- 20 src/strip.c | 7 +++++++
21 src/strip.c | 7 +++++++ 21 src/unstrip.c | 9 +++++++++
22 src/unstrip.c | 9 +++++++++ 22 4 files changed, 29 insertions(+)
23 5 files changed, 41 insertions(+), 8 deletions(-)
24 23
25diff --git a/src/arlib.h b/src/arlib.h 24diff --git a/src/arlib.h b/src/arlib.h
26index e117166..8326f6c 100644 25index e117166..8326f6c 100644
@@ -40,7 +39,7 @@ index e117166..8326f6c 100644
40 /* State of -D/-U flags. */ 39 /* State of -D/-U flags. */
41 extern bool arlib_deterministic_output; 40 extern bool arlib_deterministic_output;
42diff --git a/src/elfcompress.c b/src/elfcompress.c 41diff --git a/src/elfcompress.c b/src/elfcompress.c
43index 6ba6af4..0c7674b 100644 42index 1b5b1e3..21c9024 100644
44--- a/src/elfcompress.c 43--- a/src/elfcompress.c
45+++ b/src/elfcompress.c 44+++ b/src/elfcompress.c
46@@ -37,6 +37,13 @@ 45@@ -37,6 +37,13 @@
@@ -57,74 +56,8 @@ index 6ba6af4..0c7674b 100644
57 /* Name and version of program. */ 56 /* Name and version of program. */
58 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; 57 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
59 58
60diff --git a/src/readelf.c b/src/readelf.c
61index 64067a5..630739c 100644
62--- a/src/readelf.c
63+++ b/src/readelf.c
64@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
65 return cudie_base (&cu);
66 }
67
68+static const char *listptr_name;
69+
70 static int
71-compare_listptr (const void *a, const void *b, void *arg)
72+compare_listptr (const void *a, const void *b)
73 {
74- const char *name = arg;
75 struct listptr *p1 = (void *) a;
76 struct listptr *p2 = (void *) b;
77
78@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg)
79 p1->warned = p2->warned = true;
80 error (0, 0,
81 gettext ("%s %#" PRIx64 " used with different address sizes"),
82- name, (uint64_t) p1->offset);
83+ listptr_name, (uint64_t) p1->offset);
84 }
85 if (p1->dwarf64 != p2->dwarf64)
86 {
87 p1->warned = p2->warned = true;
88 error (0, 0,
89 gettext ("%s %#" PRIx64 " used with different offset sizes"),
90- name, (uint64_t) p1->offset);
91+ listptr_name, (uint64_t) p1->offset);
92 }
93 if (listptr_base (p1) != listptr_base (p2))
94 {
95 p1->warned = p2->warned = true;
96 error (0, 0,
97 gettext ("%s %#" PRIx64 " used with different base addresses"),
98- name, (uint64_t) p1->offset);
99+ listptr_name, (uint64_t) p1->offset);
100 }
101 if (p1->attr != p2 ->attr)
102 {
103@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg)
104 error (0, 0,
105 gettext ("%s %#" PRIx64
106 " used with different attribute %s and %s"),
107- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
108+ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
109 dwarf_attr_name (p2->attr));
110 }
111 }
112@@ -4942,8 +4943,11 @@ static void
113 sort_listptr (struct listptr_table *table, const char *name)
114 {
115 if (table->n > 0)
116- qsort_r (table->table, table->n, sizeof table->table[0],
117- &compare_listptr, (void *) name);
118+ {
119+ listptr_name = name;
120+ qsort (table->table, table->n, sizeof table->table[0],
121+ &compare_listptr);
122+ }
123 }
124
125 static bool
126diff --git a/src/strip.c b/src/strip.c 59diff --git a/src/strip.c b/src/strip.c
127index 48792a7..198a2e4 100644 60index 7a5d4e4..81a0d57 100644
128--- a/src/strip.c 61--- a/src/strip.c
129+++ b/src/strip.c 62+++ b/src/strip.c
130@@ -46,6 +46,13 @@ 63@@ -46,6 +46,13 @@
@@ -142,12 +75,12 @@ index 48792a7..198a2e4 100644
142 75
143 /* Name and version of program. */ 76 /* Name and version of program. */
144diff --git a/src/unstrip.c b/src/unstrip.c 77diff --git a/src/unstrip.c b/src/unstrip.c
145index a855038..df6fc1c 100644 78index 8580329..d547487 100644
146--- a/src/unstrip.c 79--- a/src/unstrip.c
147+++ b/src/unstrip.c 80+++ b/src/unstrip.c
148@@ -56,6 +56,15 @@ 81@@ -52,6 +52,15 @@
149 # define _(str) gettext (str) 82 #include "libeu.h"
150 #endif 83 #include "printversion.h"
151 84
152+#ifndef strndupa 85+#ifndef strndupa
153+#define strndupa(s, n) \ 86+#define strndupa(s, n) \
diff --git a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
index 5dee61210a..f407bdd0be 100644
--- a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
+++ b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
@@ -1,4 +1,4 @@
1From e4ede22e28eaa38d81667ddcb19541ece1a83cf8 Mon Sep 17 00:00:00 2001 1From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:24:06 +0800 3Date: Tue, 15 Aug 2017 17:24:06 +0800
4Subject: [PATCH] Disable the test to convert euc-jp 4Subject: [PATCH] Disable the test to convert euc-jp
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21 1 file changed, 2 insertions(+) 21 1 file changed, 2 insertions(+)
22 22
23diff --git a/m4/iconv.m4 b/m4/iconv.m4 23diff --git a/m4/iconv.m4 b/m4/iconv.m4
24index a503646..299f1eb 100644 24index aa159c5..d16312b 100644
25--- a/m4/iconv.m4 25--- a/m4/iconv.m4
26+++ b/m4/iconv.m4 26+++ b/m4/iconv.m4
27@@ -159,6 +159,7 @@ int main () 27@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
28 } 28 }
29 } 29 }
30 #endif 30 #endif
@@ -32,11 +32,11 @@ index a503646..299f1eb 100644
32 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is 32 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
33 provided. */ 33 provided. */
34 if (/* Try standardized names. */ 34 if (/* Try standardized names. */
35@@ -170,6 +171,7 @@ int main () 35@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
36 /* Try HP-UX names. */ 36 /* Try HP-UX names. */
37 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 37 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
38 result |= 16; 38 result |= 16;
39+#endif 39+#endif
40 return result; 40 return result;
41 }]])], 41 ]])],
42 [am_cv_func_iconv_works=yes], 42 [am_cv_func_iconv_works=yes], ,
diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
index 0d162ebe1b..8e1e97041f 100644
--- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
+++ b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch
@@ -1,4 +1,4 @@
1From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001 1From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 22:15:03 +0100 3Date: Wed, 1 May 2019 22:15:03 +0100
4Subject: [PATCH] Fix error on musl: 4Subject: [PATCH] Fix error on musl:
@@ -19,7 +19,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
19 1 file changed, 5 insertions(+) 19 1 file changed, 5 insertions(+)
20 20
21diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c 21diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
22index ba0d68d..1d2447f 100644 22index abbdf3f..bd90f4d 100644
23--- a/tests/elfstrmerge.c 23--- a/tests/elfstrmerge.c
24+++ b/tests/elfstrmerge.c 24+++ b/tests/elfstrmerge.c
25@@ -33,6 +33,11 @@ 25@@ -33,6 +33,11 @@
diff --git a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
index 6f7956c5ae..8942ad7828 100644
--- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+++ b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
@@ -1,4 +1,4 @@
1From 578f370c7e7a9f056aefa062b34590b0aa13bce5 Mon Sep 17 00:00:00 2001 1From 2396fd67d81e54e18fbad67a5ff67d5684a01013 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:27:30 +0800 3Date: Tue, 15 Aug 2017 17:27:30 +0800
4Subject: [PATCH] Fix build on aarch64/musl 4Subject: [PATCH] Fix build on aarch64/musl
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
index ec1b927c2e..205362626d 100644
--- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
+++ b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
@@ -1,4 +1,4 @@
1From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001 1From dfe11e043cd8ea0b0f0252bcff9f5a6b98c0ecd3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jun 2020 21:35:16 +0000 3Date: Mon, 22 Jun 2020 21:35:16 +0000
4Subject: [PATCH] config/eu.am: do not use -Werror 4Subject: [PATCH] config/eu.am: do not use -Werror
diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch
index 35b23f43b3..fe6f272a83 100644
--- a/meta/recipes-devtools/elfutils/files/ptest.patch
+++ b/meta/recipes-devtools/elfutils/files/ptest.patch
@@ -1,4 +1,7 @@
1Changes to allow ptest to run standalone on target: 1From bfbf393e7d5b1b41df85ce1c37e887776c45d529 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 16:37:48 +0100
4Subject: [PATCH] Changes to allow ptest to run standalone on target:
2 5
3a) Run the tests serially 6a) Run the tests serially
4b) Use the standalone test mode which allows the tests to be run in their 7b) Use the standalone test mode which allows the tests to be run in their
@@ -12,11 +15,17 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12 15
13Upstream-Status: Inappropriate [oe specific] 16Upstream-Status: Inappropriate [oe specific]
14 17
15Index: elfutils-0.176/configure.ac 18---
16=================================================================== 19 configure.ac | 2 +-
17--- elfutils-0.176.orig/configure.ac 20 tests/Makefile.am | 2 ++
18+++ elfutils-0.176/configure.ac 21 tests/test-subr.sh | 6 ------
19@@ -45,7 +45,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2018 Th 22 3 files changed, 3 insertions(+), 7 deletions(-)
23
24diff --git a/configure.ac b/configure.ac
25index d345495..67933d1 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -48,7 +48,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2021 The elfutils developers.])
20 AC_PREREQ(2.63) dnl Minimum Autoconf version required. 29 AC_PREREQ(2.63) dnl Minimum Autoconf version required.
21 30
22 dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. 31 dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
@@ -25,42 +34,20 @@ Index: elfutils-0.176/configure.ac
25 AM_MAINTAINER_MODE 34 AM_MAINTAINER_MODE
26 35
27 AM_SILENT_RULES([yes]) 36 AM_SILENT_RULES([yes])
28Index: elfutils-0.176/tests/Makefile.am 37diff --git a/tests/Makefile.am b/tests/Makefile.am
29=================================================================== 38index 72afd0e..a2dfd43 100644
30--- elfutils-0.176.orig/tests/Makefile.am 39--- a/tests/Makefile.am
31+++ elfutils-0.176/tests/Makefile.am 40+++ b/tests/Makefile.am
32@@ -445,10 +445,10 @@ installed_TESTS_ENVIRONMENT = libdir=$(D 41@@ -698,3 +698,5 @@ check: check-am coverage
33 installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
34 installed $(tests_rpath) \
35 '$(program_transform_name)'
36-if STANDALONE
37+if !STANDALONE
38 TESTS_ENVIRONMENT = $(installed_TESTS_ENVIRONMENT)
39 LOG_COMPILER = $(installed_LOG_COMPILER)
40-else !STANDALONE
41+else STANDALONE
42 TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
43 abs_srcdir=$(abs_srcdir); abs_builddir=$(abs_builddir); \
44 abs_top_builddir=$(abs_top_builddir); \
45@@ -463,7 +463,7 @@ installcheck-local:
46 $(MAKE) $(AM_MAKEFLAGS) \
47 TESTS_ENVIRONMENT="$(installed_TESTS_ENVIRONMENT)" \
48 LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS
49-endif !STANDALONE
50+endif STANDALONE
51
52 if STANDALONE
53 libdw = -ldw
54@@ -612,3 +612,5 @@ check: check-am coverage
55 coverage: 42 coverage:
56 -$(srcdir)/coverage.sh 43 -$(srcdir)/coverage.sh
57 endif 44 endif
58+oecheck: 45+oecheck:
59+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) 46+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
60Index: elfutils-0.176/tests/test-subr.sh 47diff --git a/tests/test-subr.sh b/tests/test-subr.sh
61=================================================================== 48index 411e5f2..a638ff9 100644
62--- elfutils-0.176.orig/tests/test-subr.sh 49--- a/tests/test-subr.sh
63+++ elfutils-0.176/tests/test-subr.sh 50+++ b/tests/test-subr.sh
64@@ -91,12 +91,6 @@ installed_testrun() 51@@ -91,12 +91,6 @@ installed_testrun()
65 program="$1" 52 program="$1"
66 shift 53 shift
diff --git a/meta/recipes-devtools/elfutils/files/run-ptest b/meta/recipes-devtools/elfutils/files/run-ptest
index 81b81f2f5d..d5776fdb53 100644
--- a/meta/recipes-devtools/elfutils/files/run-ptest
+++ b/meta/recipes-devtools/elfutils/files/run-ptest
@@ -3,4 +3,4 @@
3#This script is used to run elfutils test suites 3#This script is used to run elfutils test suites
4cd tests 4cd tests
5 5
6make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-, 6make -k installcheck-local CC=gcc abs_srcdir=$PWD abs_builddir=$PWD srcdir=$PWD top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed elfutils_tests_rpath=no program_transform_name=s,^,eu-,