summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-06 07:42:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-07 17:25:02 +0000
commit4d80c539be2eaed05f859f7701b5f89f69fcac6f (patch)
treeae5ad685b741a11a5447fcf1a72279bab3c8b91f
parent053fe287eae4071e6dc61a28645dc7bbd623fa37 (diff)
downloadpoky-4d80c539be2eaed05f859f7701b5f89f69fcac6f.tar.gz
elfutils: upgrade 0.189 -> 0.191
Drop backports: 0001-Add-helper-function-for-basename.patch 0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch (From OE-Core rev: 797117902490fcd336697397ea5d8c2a601124b2) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.191.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.189.bb)7
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-Add-helper-function-for-basename.patch404
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch19
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch15
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch7
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch3
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch7
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch39
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch9
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch7
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-musl-utils.patch9
-rw-r--r--meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch3
-rw-r--r--meta/recipes-devtools/elfutils/files/ptest.patch11
13 files changed, 45 insertions, 495 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.189.bb b/meta/recipes-devtools/elfutils/elfutils_0.191.bb
index 076ba47358..b3b2476f0f 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.189.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.191.bb
@@ -21,13 +21,11 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
21 file://0001-skip-the-test-when-gcc-not-deployed.patch \ 21 file://0001-skip-the-test-when-gcc-not-deployed.patch \
22 file://ptest.patch \ 22 file://ptest.patch \
23 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ 23 file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
24 file://0001-Add-helper-function-for-basename.patch \
25 file://0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch \
26 " 24 "
27SRC_URI:append:libc-musl = " \ 25SRC_URI:append:libc-musl = " \
28 file://0003-musl-utils.patch \ 26 file://0003-musl-utils.patch \
29 " 27 "
30SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8" 28SRC_URI[sha256sum] = "df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871"
31 29
32inherit autotools gettext ptest pkgconfig 30inherit autotools gettext ptest pkgconfig
33 31
@@ -69,7 +67,7 @@ PTEST_PARALLEL_MAKE = ""
69do_install_ptest() { 67do_install_ptest() {
70 if [ ${PTEST_ENABLED} = "1" ]; then 68 if [ ${PTEST_ENABLED} = "1" ]; then
71 # copy the files which needed by the cases 69 # copy the files which needed by the cases
72 TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint elfcompress elfclassify stack unstrip" 70 TEST_FILES="strip strip.o addr2line elfcmp objdump readelf size.o nm.o nm elflint elfcompress elfclassify stack unstrip srcfiles"
73 install -d -m 755 ${D}${PTEST_PATH}/src 71 install -d -m 755 ${D}${PTEST_PATH}/src
74 install -d -m 755 ${D}${PTEST_PATH}/lib 72 install -d -m 755 ${D}${PTEST_PATH}/lib
75 install -d -m 755 ${D}${PTEST_PATH}/libelf 73 install -d -m 755 ${D}${PTEST_PATH}/libelf
@@ -166,6 +164,7 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
166 ${PKGD}${PTEST_PATH}/src/elfclassify \ 164 ${PKGD}${PTEST_PATH}/src/elfclassify \
167 ${PKGD}${PTEST_PATH}/src/stack \ 165 ${PKGD}${PTEST_PATH}/src/stack \
168 ${PKGD}${PTEST_PATH}/src/unstrip \ 166 ${PKGD}${PTEST_PATH}/src/unstrip \
167 ${PKGD}${PTEST_PATH}/src/srcfiles \
169 ${PKGD}${PTEST_PATH}/libelf/libelf.so \ 168 ${PKGD}${PTEST_PATH}/libelf/libelf.so \
170 ${PKGD}${PTEST_PATH}/libdw/libdw.so \ 169 ${PKGD}${PTEST_PATH}/libdw/libdw.so \
171 ${PKGD}${PTEST_PATH}/libasm/libasm.so \ 170 ${PKGD}${PTEST_PATH}/libasm/libasm.so \
diff --git a/meta/recipes-devtools/elfutils/files/0001-Add-helper-function-for-basename.patch b/meta/recipes-devtools/elfutils/files/0001-Add-helper-function-for-basename.patch
deleted file mode 100644
index 3e6033fd75..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-Add-helper-function-for-basename.patch
+++ /dev/null
@@ -1,404 +0,0 @@
1From 666372a5d8d5a23203c70d583904097c9e49c5a0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Dec 2023 18:23:03 -0800
4Subject: [PATCH] Add helper function for basename
5
6musl does not provide GNU version of basename and lately have removed
7the definiton from string.h [1] which exposes this problem. It can be
8made to work by providing a local implementation of basename which
9implements the GNU basename behavior, this makes it work across C
10libraries which have POSIX implementation only.
11
12Upstream-Status: Submitted [https://sourceware.org/pipermail/elfutils-devel/2023q4/006727.html]
13[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 lib/Makefile.am | 2 +-
17 lib/libeu.h | 1 +
18 lib/{libeu.h => xbasename.c} | 31 ++++++++++------------------
19 libdw/dwarf_getsrc_file.c | 3 ++-
20 libdwfl/core-file.c | 3 ++-
21 libdwfl/dwfl_module_getsrc_file.c | 3 ++-
22 libdwfl/dwfl_segment_report_module.c | 3 ++-
23 libdwfl/find-debuginfo.c | 7 ++++---
24 libdwfl/link_map.c | 3 ++-
25 libdwfl/linux-kernel-modules.c | 3 ++-
26 src/addr2line.c | 5 +++--
27 src/ar.c | 5 +++--
28 src/nm.c | 4 ++--
29 src/stack.c | 3 ++-
30 src/strip.c | 2 +-
31 tests/show-die-info.c | 2 +-
32 tests/varlocs.c | 2 +-
33 17 files changed, 42 insertions(+), 40 deletions(-)
34 copy lib/{libeu.h => xbasename.c} (57%)
35
36--- a/lib/Makefile.am
37+++ b/lib/Makefile.am
38@@ -33,7 +33,7 @@ AM_CPPFLAGS += -I$(srcdir)/../libelf
39
40 noinst_LIBRARIES = libeu.a
41
42-libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \
43+libeu_a_SOURCES = xasprintf.c xbasename.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \
44 crc32.c crc32_file.c \
45 color.c error.c printversion.c
46
47--- a/lib/libeu.h
48+++ b/lib/libeu.h
49@@ -42,6 +42,7 @@ extern char *xstrndup (const char *, siz
50 extern char *xasprintf(const char *fmt, ...)
51 __attribute__ ((format (printf, 1, 2))) __attribute__ ((__malloc__));
52
53+extern const char *xbasename(const char *s);
54 extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
55 extern int crc32_file (int fd, uint32_t *resp);
56
57--- /dev/null
58+++ b/lib/xbasename.c
59@@ -0,0 +1,39 @@
60+/* Convenience function for basename extraction.
61+ Copyright (C) 2023 Khem Raj.
62+ This file is part of elfutils.
63+
64+ This file is free software; you can redistribute it and/or modify
65+ it under the terms of either
66+
67+ * the GNU Lesser General Public License as published by the Free
68+ Software Foundation; either version 3 of the License, or (at
69+ your option) any later version
70+
71+ or
72+
73+ * the GNU General Public License as published by the Free
74+ Software Foundation; either version 2 of the License, or (at
75+ your option) any later version
76+
77+ or both in parallel, as here.
78+
79+ elfutils is distributed in the hope that it will be useful, but
80+ WITHOUT ANY WARRANTY; without even the implied warranty of
81+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
82+ General Public License for more details.
83+
84+ You should have received copies of the GNU General Public License and
85+ the GNU Lesser General Public License along with this program. If
86+ not, see <http://www.gnu.org/licenses/>. */
87+
88+#ifdef HAVE_CONFIG_H
89+# include <config.h>
90+#endif
91+
92+#include <string.h>
93+
94+const char *
95+xbasename(const char *s) {
96+ const char *p = strrchr(s, '/');
97+ return p ? p+1 : s;
98+}
99--- a/libdw/dwarf_getsrc_file.c
100+++ b/libdw/dwarf_getsrc_file.c
101@@ -37,6 +37,7 @@
102 #include <string.h>
103
104 #include "libdwP.h"
105+#include "libeu.h"
106
107
108 int
109@@ -98,7 +99,7 @@ dwarf_getsrc_file (Dwarf *dbg, const cha
110 /* Match the name with the name the user provided. */
111 const char *fname2 = line->files->info[lastfile].name;
112 if (is_basename)
113- lastmatch = strcmp (basename (fname2), fname) == 0;
114+ lastmatch = strcmp (xbasename (fname2), fname) == 0;
115 else
116 lastmatch = strcmp (fname2, fname) == 0;
117 }
118--- a/libdwfl/core-file.c
119+++ b/libdwfl/core-file.c
120@@ -29,6 +29,7 @@
121
122 #include <config.h>
123 #include "libelfP.h" /* For NOTE_ALIGN. */
124+#include "libeu.h"
125 #include "libdwflP.h"
126 #include <gelf.h>
127
128@@ -595,7 +596,7 @@ dwfl_core_file_report (Dwfl *dwfl, Elf *
129 if (! __libdwfl_dynamic_vaddr_get (module->elf, &file_dynamic_vaddr))
130 continue;
131 Dwfl_Module *mod;
132- mod = __libdwfl_report_elf (dwfl, basename (module->name), module->name,
133+ mod = __libdwfl_report_elf (dwfl, xbasename (module->name), module->name,
134 module->fd, module->elf,
135 module->l_ld - file_dynamic_vaddr,
136 true, true);
137--- a/libdwfl/dwfl_module_getsrc_file.c
138+++ b/libdwfl/dwfl_module_getsrc_file.c
139@@ -31,6 +31,7 @@
140 #endif
141
142 #include "libdwflP.h"
143+#include "libeu.h"
144 #include "libdwP.h"
145
146
147@@ -103,7 +104,7 @@ dwfl_module_getsrc_file (Dwfl_Module *mo
148 {
149 /* Match the name with the name the user provided. */
150 lastfile = file;
151- lastmatch = !strcmp (is_basename ? basename (file) : file,
152+ lastmatch = !strcmp (is_basename ? xbasename (file) : file,
153 fname);
154 }
155 }
156--- a/libdwfl/dwfl_segment_report_module.c
157+++ b/libdwfl/dwfl_segment_report_module.c
158@@ -29,6 +29,7 @@
159
160 #include <config.h>
161 #include "libelfP.h" /* For NOTE_ALIGN4 and NOTE_ALIGN8. */
162+#include "libeu.h"
163 #include "libdwflP.h"
164 #include "common.h"
165
166@@ -718,7 +719,7 @@ dwfl_segment_report_module (Dwfl *dwfl,
167 bias += fixup;
168 if (module->name[0] != '\0')
169 {
170- name = basename (module->name);
171+ name = xbasename (module->name);
172 name_is_final = true;
173 }
174 break;
175--- a/libdwfl/find-debuginfo.c
176+++ b/libdwfl/find-debuginfo.c
177@@ -31,6 +31,7 @@
178 #endif
179
180 #include "libdwflP.h"
181+#include "libeu.h"
182 #include <stdio.h>
183 #include <fcntl.h>
184 #include <sys/stat.h>
185@@ -164,7 +165,7 @@ find_debuginfo_in_path (Dwfl_Module *mod
186 {
187 bool cancheck = debuglink_crc != (GElf_Word) 0;
188
189- const char *file_basename = file_name == NULL ? NULL : basename (file_name);
190+ const char *file_basename = file_name == NULL ? NULL : xbasename (file_name);
191 char *localname = NULL;
192
193 /* We invent a debuglink .debug name if NULL, but then want to try the
194@@ -278,7 +279,7 @@ find_debuginfo_in_path (Dwfl_Module *mod
195 else
196 {
197 subdir = NULL;
198- file = basename (debuglink_file);
199+ file = xbasename (debuglink_file);
200 }
201 try_file_basename = debuglink_null;
202 break;
203@@ -306,7 +307,7 @@ find_debuginfo_in_path (Dwfl_Module *mod
204 if (mod->dw != NULL && (p[0] == '\0' || p[0] == '/'))
205 {
206 fd = try_open (&main_stat, dir, ".dwz",
207- basename (file), &fname);
208+ xbasename (file), &fname);
209 if (fd < 0)
210 {
211 if (errno != ENOENT && errno != ENOTDIR)
212--- a/libdwfl/link_map.c
213+++ b/libdwfl/link_map.c
214@@ -29,6 +29,7 @@
215
216 #include <config.h>
217 #include "libdwflP.h"
218+#include "libeu.h"
219 #include "memory-access.h"
220 #include "system.h"
221
222@@ -469,7 +470,7 @@ report_r_debug (uint_fast8_t elfclass, u
223 if (r_debug_info_module == NULL)
224 {
225 // XXX hook for sysroot
226- mod = __libdwfl_report_elf (dwfl, basename (name),
227+ mod = __libdwfl_report_elf (dwfl, xbasename (name),
228 name, fd, elf, base,
229 true, true);
230 if (mod != NULL)
231--- a/libdwfl/linux-kernel-modules.c
232+++ b/libdwfl/linux-kernel-modules.c
233@@ -40,6 +40,7 @@
234 #include <system.h>
235
236 #include "libelfP.h"
237+#include "libeu.h"
238 #include "libdwflP.h"
239 #include <inttypes.h>
240 #include <errno.h>
241@@ -116,7 +117,7 @@ try_kernel_name (Dwfl *dwfl, char **fnam
242 /* Try the file's unadorned basename as DEBUGLINK_FILE,
243 to look only for "vmlinux" files. */
244 fd = INTUSE(dwfl_standard_find_debuginfo) (&fakemod, NULL, NULL, 0,
245- *fname, basename (*fname),
246+ *fname, xbasename (*fname),
247 0, &fakemod.debug.name);
248
249 if (fakemod.debug.name != NULL)
250--- a/src/addr2line.c
251+++ b/src/addr2line.c
252@@ -38,6 +38,7 @@
253
254 #include <system.h>
255 #include <printversion.h>
256+#include "libeu.h"
257
258
259 /* Name and version of program. */
260@@ -385,7 +386,7 @@ print_dwarf_function (Dwfl_Module *mod,
261 if (file == NULL)
262 file = "???";
263 else if (only_basenames)
264- file = basename (file);
265+ file = xbasename (file);
266 else if (use_comp_dir && file[0] != '/')
267 {
268 const char *const *dirs;
269@@ -568,7 +569,7 @@ print_src (const char *src, int lineno,
270 const char *comp_dir_sep = "";
271
272 if (only_basenames)
273- src = basename (src);
274+ src = xbasename (src);
275 else if (use_comp_dir && src[0] != '/')
276 {
277 Dwarf_Attribute attr;
278--- a/src/ar.c
279+++ b/src/ar.c
280@@ -42,6 +42,7 @@
281 #include <printversion.h>
282
283 #include "arlib.h"
284+#include "libeu.h"
285
286
287 /* Name and version of program. */
288@@ -1133,7 +1134,7 @@ do_oper_insert (int oper, const char *ar
289 for (int cnt = 0; cnt < argc; ++cnt)
290 {
291 ENTRY entry;
292- entry.key = full_path ? argv[cnt] : basename (argv[cnt]);
293+ entry.key = full_path ? argv[cnt] : (char*)xbasename (argv[cnt]);
294 entry.data = &argv[cnt];
295 if (hsearch (entry, ENTER) == NULL)
296 error_exit (errno, _("cannot insert into hash table"));
297@@ -1242,7 +1243,7 @@ do_oper_insert (int oper, const char *ar
298 /* Open all the new files, get their sizes and add all symbols. */
299 for (int cnt = 0; cnt < argc; ++cnt)
300 {
301- const char *bname = basename (argv[cnt]);
302+ const char *bname = xbasename (argv[cnt]);
303 size_t bnamelen = strlen (bname);
304 if (found[cnt] == NULL)
305 {
306--- a/src/nm.c
307+++ b/src/nm.c
308@@ -1417,7 +1417,7 @@ show_symbols (int fd, Ebl *ebl, GElf_Ehd
309 int lineno;
310 (void) dwarf_lineno (line, &lineno);
311 const char *file = dwarf_linesrc (line, NULL, NULL);
312- file = (file != NULL) ? basename (file) : "???";
313+ file = (file != NULL) ? xbasename (file) : "???";
314 int n;
315 n = obstack_printf (&whereob, "%s:%d%c", file,
316 lineno, '\0');
317@@ -1448,7 +1448,7 @@ show_symbols (int fd, Ebl *ebl, GElf_Ehd
318 {
319 /* We found the line. */
320 int n = obstack_printf (&whereob, "%s:%" PRIu64 "%c",
321- basename ((*found)->file),
322+ xbasename ((*found)->file),
323 (*found)->lineno,
324 '\0');
325 sym_mem[nentries_used].where = obstack_finish (&whereob);
326--- a/src/stack.c
327+++ b/src/stack.c
328@@ -31,6 +31,7 @@
329 #include <system.h>
330 #include <printversion.h>
331
332+#include "libeu.h"
333 /* Name and version of program. */
334 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
335
336@@ -152,7 +153,7 @@ module_callback (Dwfl_Module *mod, void
337
338 int width = get_addr_width (mod);
339 printf ("0x%0*" PRIx64 "-0x%0*" PRIx64 " %s\n",
340- width, start, width, end, basename (name));
341+ width, start, width, end, xbasename (name));
342
343 const unsigned char *id;
344 GElf_Addr id_vaddr;
345--- a/src/strip.c
346+++ b/src/strip.c
347@@ -1807,7 +1807,7 @@ handle_elf (int fd, Elf *elf, const char
348 elf_errmsg (-1));
349 }
350
351- char *debug_basename = basename (debug_fname_embed ?: debug_fname);
352+ const char *debug_basename = xbasename (debug_fname_embed ?: debug_fname);
353 off_t crc_offset = strlen (debug_basename) + 1;
354 /* Align to 4 byte boundary */
355 crc_offset = ((crc_offset - 1) & ~3) + 4;
356--- a/tests/show-die-info.c
357+++ b/tests/show-die-info.c
358@@ -26,6 +26,7 @@
359 #include <string.h>
360 #include <unistd.h>
361
362+#include "../lib/libeu.h"
363 #include "../libdw/known-dwarf.h"
364
365 static const char *
366@@ -318,7 +319,7 @@ main (int argc, char *argv[])
367 int fd = open (argv[cnt], O_RDONLY);
368 Dwarf *dbg;
369
370- printf ("file: %s\n", basename (argv[cnt]));
371+ printf ("file: %s\n", xbasename (argv[cnt]));
372
373 dbg = dwarf_begin (fd, DWARF_C_READ);
374 if (dbg == NULL)
375--- a/tests/varlocs.c
376+++ b/tests/varlocs.c
377@@ -33,6 +33,7 @@
378
379 #include "system.h"
380 #include "../libdw/known-dwarf.h"
381+#include "../lib/libeu.h"
382
383 // The Dwarf, Dwarf_CFIs and address bias of
384 // cfi table to adjust DWARF addresses against.
385@@ -1120,7 +1121,7 @@ main (int argc, char *argv[])
386
387 const char *name = (modname[0] != '\0'
388 ? modname
389- : basename (mainfile));
390+ : xbasename (mainfile));
391 printf ("module '%s'\n", name);
392 print_die (&cudie, "CU", 0);
393
394--- a/tests/Makefile.am
395+++ b/tests/Makefile.am
396@@ -692,7 +692,7 @@ update1_LDADD = $(libelf)
397 update2_LDADD = $(libelf)
398 update3_LDADD = $(libdw) $(libelf)
399 update4_LDADD = $(libdw) $(libelf)
400-show_die_info_LDADD = $(libdw) $(libelf)
401+show_die_info_LDADD = $(libeu) $(libdw) $(libelf)
402 get_pubnames_LDADD = $(libdw) $(libelf)
403 show_abbrev_LDADD = $(libdw) $(libelf)
404 get_lines_LDADD = $(libdw) $(libelf)
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 6acc036406..4f7539bef2 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 c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001 1From 63070df4b0dc7af37a720915b5e6494204463c9a 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
@@ -16,31 +16,30 @@ more details.
16Rebase to 0.170 16Rebase to 0.170
17 17
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19
20--- 19---
21 src/Makefile.am | 2 +- 20 src/Makefile.am | 2 +-
22 tests/Makefile.am | 2 +- 21 tests/Makefile.am | 2 +-
23 2 files changed, 2 insertions(+), 2 deletions(-) 22 2 files changed, 2 insertions(+), 2 deletions(-)
24 23
25diff --git a/src/Makefile.am b/src/Makefile.am 24diff --git a/src/Makefile.am b/src/Makefile.am
26index 88d0ac8..c28d81f 100644 25index 1d592d4..853eda4 100644
27--- a/src/Makefile.am 26--- a/src/Makefile.am
28+++ b/src/Makefile.am 27+++ b/src/Makefile.am
29@@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread 28@@ -50,7 +50,7 @@ libdebuginfod =
30 libelf = ../libelf/libelf.a -lz 29 endif
31 else 30 else
32 libasm = ../libasm/libasm.so 31 libasm = ../libasm/libasm.so
33-libdw = ../libdw/libdw.so 32-libdw = ../libdw/libdw.so
34+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl 33+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
35 libelf = ../libelf/libelf.so 34 libelf = ../libelf/libelf.so
36 endif 35 if LIBDEBUGINFOD
37 libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a 36 libdebuginfod = ../debuginfod/libdebuginfod.so
38diff --git a/tests/Makefile.am b/tests/Makefile.am 37diff --git a/tests/Makefile.am b/tests/Makefile.am
39index c145720..72afd0e 100644 38index 9141074..ee49d07 100644
40--- a/tests/Makefile.am 39--- a/tests/Makefile.am
41+++ b/tests/Makefile.am 40+++ b/tests/Makefile.am
42@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread 41@@ -694,7 +694,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
43 libelf = ../libelf/libelf.a -lz 42 libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
44 libasm = ../libasm/libasm.a 43 libasm = ../libasm/libasm.a
45 else 44 else
46-libdw = ../libdw/libdw.so 45-libdw = ../libdw/libdw.so
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 09c9d3ea24..a9f5e030fc 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 ed1975deeaa47f98d212fd144c8bda075b1a5d36 Mon Sep 17 00:00:00 2001 1From 46d9d889a07fc9f9f089f800e5c0e895889c44ae 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
@@ -11,26 +11,29 @@ where indirect libraries may be not found by linker
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15--- 14---
16 src/Makefile.am | 4 ++-- 15 src/Makefile.am | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
18 17
19diff --git a/src/Makefile.am b/src/Makefile.am 18diff --git a/src/Makefile.am b/src/Makefile.am
20index c28d81f..951e978 100644 19index 853eda4..da7f3b4 100644
21--- a/src/Makefile.am 20--- a/src/Makefile.am
22+++ b/src/Makefile.am 21+++ b/src/Makefile.am
23@@ -40,11 +40,11 @@ EXTRA_DIST += make-debug-archive.in 22@@ -40,7 +40,7 @@ EXTRA_DIST += make-debug-archive.in
24 CLEANFILES += make-debug-archive 23 CLEANFILES += make-debug-archive
25 24
26 if BUILD_STATIC 25 if BUILD_STATIC
27-libasm = ../libasm/libasm.a 26-libasm = ../libasm/libasm.a
28+libasm = ../libasm/libasm.a $(zip_LIBS) 27+libasm = ../libasm/libasm.a $(zip_LIBS)
29 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread 28 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
30 libelf = ../libelf/libelf.a -lz 29 libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
30 if LIBDEBUGINFOD
31@@ -49,7 +49,7 @@ else
32 libdebuginfod =
33 endif
31 else 34 else
32-libasm = ../libasm/libasm.so 35-libasm = ../libasm/libasm.so
33+libasm = ../libasm/libasm.so $(zip_LIBS) 36+libasm = ../libasm/libasm.so $(zip_LIBS)
34 libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl 37 libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
35 libelf = ../libelf/libelf.so 38 libelf = ../libelf/libelf.so
36 endif 39 if LIBDEBUGINFOD
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 c8d55d583a..57e4b3890a 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 f40cbd43acdb1fefef4fa53a6034296d83cbff7d Mon Sep 17 00:00:00 2001 1From 19d9e9d838e74e4a0a22f08ae03167380f8aa490 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
@@ -14,16 +14,15 @@ The segmentation fault happens when prelink call elf_end().
14Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2018-q3/msg00085.html] 14Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2018-q3/msg00085.html]
15 15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17
18--- 17---
19 libelf/elf_end.c | 6 ++++-- 18 libelf/elf_end.c | 6 ++++--
20 1 file changed, 4 insertions(+), 2 deletions(-) 19 1 file changed, 4 insertions(+), 2 deletions(-)
21 20
22diff --git a/libelf/elf_end.c b/libelf/elf_end.c 21diff --git a/libelf/elf_end.c b/libelf/elf_end.c
23index 160f0b8..5280a70 100644 22index 80f4d13..b103959 100644
24--- a/libelf/elf_end.c 23--- a/libelf/elf_end.c
25+++ b/libelf/elf_end.c 24+++ b/libelf/elf_end.c
26@@ -160,14 +160,16 @@ elf_end (Elf *elf) 25@@ -169,14 +169,16 @@ elf_end (Elf *elf)
27 architecture doesn't require overly stringent 26 architecture doesn't require overly stringent
28 alignment the raw data buffer is the same as the 27 alignment the raw data buffer is the same as the
29 one used for presenting to the caller. */ 28 one used for presenting to the caller. */
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 0e6bf5573c..096361e215 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,4 +1,4 @@
1From 2fa52d61b1abdf4a3f3b153c771fb2081666430c Mon Sep 17 00:00:00 2001 1From f9ab54454000fd210dbaa92cf516084d05060f9d 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] skip the test when gcc not deployed 4Subject: [PATCH] skip the test when gcc not deployed
@@ -9,7 +9,6 @@ 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
13--- 12---
14 tests/run-disasm-x86-64.sh | 2 ++ 13 tests/run-disasm-x86-64.sh | 2 ++
15 tests/run-disasm-x86.sh | 2 ++ 14 tests/run-disasm-x86.sh | 2 ++
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 a2c0b90227..d410eb13d8 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 e355ca3b8ddcc6e73ee140f53d25634afdaec0da Mon Sep 17 00:00:00 2001 1From 2d4dfb814dda02193e49c9203147cf73e6d3f8b7 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
@@ -8,16 +8,15 @@ be reproducible.
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12--- 11---
13 tests/Makefile.am | 2 +- 12 tests/Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/tests/Makefile.am b/tests/Makefile.am 15diff --git a/tests/Makefile.am b/tests/Makefile.am
17index 2ade5d9..f85cdba 100644 16index 3bd8e58..370c6a8 100644
18--- a/tests/Makefile.am 17--- a/tests/Makefile.am
19+++ b/tests/Makefile.am 18+++ b/tests/Makefile.am
20@@ -98,7 +98,7 @@ endif 19@@ -103,7 +103,7 @@ endif
21 test-nlist$(EXEEXT): test-nlist.c 20 test-nlist$(EXEEXT): test-nlist.c
22 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 21 $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
23 $(AM_CPPFLAGS) $(CPPFLAGS) \ 22 $(AM_CPPFLAGS) $(CPPFLAGS) \
diff --git a/meta/recipes-devtools/elfutils/files/0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch b/meta/recipes-devtools/elfutils/files/0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch
deleted file mode 100644
index 5e0c7e9766..0000000000
--- a/meta/recipes-devtools/elfutils/files/0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 901c6a8c78c3c4eee244b9d5298cbd7b9aa713d1 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Thu, 21 Dec 2023 09:23:30 +0000
4Subject: [PATCH] tests: fix build against upcoming `gcc-14`
5 (`-Werror=calloc-transposed-args`)
6
7`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
8detected minor infelicity in `calloc()` API usage in `elfutils`:
9
10 elfstrmerge.c: In function 'main':
11 elfstrmerge.c:450:32: error:
12 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
13 450 | newscnbufs = calloc (sizeof (void *), newshnums);
14 | ^~~~
15 elfstrmerge.c:450:32: note: earlier argument should specify number of elements, later size of each element
16
17Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=ae580d48278b9924da7503886b37be34378e1b04]
18Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 tests/elfstrmerge.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
25index 56350bb..4eb58bb 100644
26--- a/tests/elfstrmerge.c
27+++ b/tests/elfstrmerge.c
28@@ -447,7 +447,7 @@ main (int argc, char **argv)
29 }
30
31 newshnums = shdrnum - 1;
32- newscnbufs = calloc (sizeof (void *), newshnums);
33+ newscnbufs = calloc (newshnums, sizeof (void *));
34 if (newscnbufs == NULL)
35 fail_errno ("Couldn't allocate memory for new section buffers", NULL);
36
37--
382.43.0
39
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 be48ef010b..fa2282b8dd 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 1643d793761216252bb654e28aaa5b8eb1536bca Mon Sep 17 00:00:00 2001 1From d8f07a23d608b744dcc0592f9f32f258b186a77c 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.
@@ -12,16 +12,15 @@ Signed-off-by: Baoshan Pang <BaoShan.Pang@windriver.com>
12 12
13Rebase to 0.170 13Rebase to 0.170
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15
16--- 15---
17 libelf/gnuhash_xlate.h | 3 ++- 16 libelf/gnuhash_xlate.h | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
19 18
20diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h 19diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
21index 6faf113..04d9ca1 100644 20index 3a00ae0..40468fc 100644
22--- a/libelf/gnuhash_xlate.h 21--- a/libelf/gnuhash_xlate.h
23+++ b/libelf/gnuhash_xlate.h 22+++ b/libelf/gnuhash_xlate.h
24@@ -40,6 +40,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) 23@@ -42,6 +42,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
25 words. We must detangle them here. */ 24 words. We must detangle them here. */
26 Elf32_Word *dest32 = dest; 25 Elf32_Word *dest32 = dest;
27 const Elf32_Word *src32 = src; 26 const Elf32_Word *src32 = src;
@@ -29,7 +28,7 @@ index 6faf113..04d9ca1 100644
29 28
30 /* First four control words, 32 bits. */ 29 /* First four control words, 32 bits. */
31 for (unsigned int cnt = 0; cnt < 4; ++cnt) 30 for (unsigned int cnt = 0; cnt < 4; ++cnt)
32@@ -50,7 +51,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) 31@@ -52,7 +53,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
33 len -= 4; 32 len -= 4;
34 } 33 }
35 34
diff --git a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
index 212b358dc2..e8b986e4ba 100644
--- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
@@ -1,4 +1,4 @@
1From 7e1f91c42ef5b0bf10afefec10dd08588df3ab1f Mon Sep 17 00:00:00 2001 1From 614f062b22e6da108643f8644a3e92a1108f2b9b 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
@@ -16,16 +16,15 @@ Upstream-Status: Pending
16 16
17Rebase to 0.170 17Rebase to 0.170
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19
20--- 19---
21 libelf/elf32_updatenull.c | 4 ++-- 20 libelf/elf32_updatenull.c | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-) 21 1 file changed, 2 insertions(+), 2 deletions(-)
23 22
24diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c 23diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
25index d0d4d1e..4ecf5a5 100644 24index 3594e8b..a3314e5 100644
26--- a/libelf/elf32_updatenull.c 25--- a/libelf/elf32_updatenull.c
27+++ b/libelf/elf32_updatenull.c 26+++ b/libelf/elf32_updatenull.c
28@@ -354,8 +354,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) 27@@ -355,8 +355,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
29 we test for the alignment of the section being large 28 we test for the alignment of the section being large
30 enough for the largest alignment required by a data 29 enough for the largest alignment required by a data
31 block. */ 30 block. */
diff --git a/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch b/meta/recipes-devtools/elfutils/files/0003-musl-utils.patch
index 93f5bdcd00..230ea88f41 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 262ac90394e36e0b4e86042d9c5385703f5b6536 Mon Sep 17 00:00:00 2001 1From aab5985a29bd7ab6e0b06eaab190b42a04e10f70 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
@@ -13,7 +13,6 @@ Upstream-Status: Inappropriate [workaround for musl]
13 13
14Rebase to 0.177 14Rebase to 0.177
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16
17--- 16---
18 src/arlib.h | 6 ++++++ 17 src/arlib.h | 6 ++++++
19 src/elfcompress.c | 7 +++++++ 18 src/elfcompress.c | 7 +++++++
@@ -39,7 +38,7 @@ index d4a4221..f6336d9 100644
39 /* State of -D/-U flags. */ 38 /* State of -D/-U flags. */
40 extern bool arlib_deterministic_output; 39 extern bool arlib_deterministic_output;
41diff --git a/src/elfcompress.c b/src/elfcompress.c 40diff --git a/src/elfcompress.c b/src/elfcompress.c
42index 18ade66..a6ed4e1 100644 41index f771b92..263de62 100644
43--- a/src/elfcompress.c 42--- a/src/elfcompress.c
44+++ b/src/elfcompress.c 43+++ b/src/elfcompress.c
45@@ -37,6 +37,13 @@ 44@@ -37,6 +37,13 @@
@@ -57,7 +56,7 @@ index 18ade66..a6ed4e1 100644
57 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; 56 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
58 57
59diff --git a/src/strip.c b/src/strip.c 58diff --git a/src/strip.c b/src/strip.c
60index 2a2cc80..8e9f773 100644 59index 6436443..1608496 100644
61--- a/src/strip.c 60--- a/src/strip.c
62+++ b/src/strip.c 61+++ b/src/strip.c
63@@ -45,6 +45,13 @@ 62@@ -45,6 +45,13 @@
@@ -75,7 +74,7 @@ index 2a2cc80..8e9f773 100644
75 74
76 /* Name and version of program. */ 75 /* Name and version of program. */
77diff --git a/src/unstrip.c b/src/unstrip.c 76diff --git a/src/unstrip.c b/src/unstrip.c
78index d5bd182..d797823 100644 77index d70053d..b8a6ff3 100644
79--- a/src/unstrip.c 78--- a/src/unstrip.c
80+++ b/src/unstrip.c 79+++ b/src/unstrip.c
81@@ -51,6 +51,15 @@ 80@@ -51,6 +51,15 @@
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 8942ad7828..149e0e6a7b 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 2396fd67d81e54e18fbad67a5ff67d5684a01013 Mon Sep 17 00:00:00 2001 1From 4409f128c81a9d76b9360b002a1d76043c77b53e 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
@@ -16,7 +16,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 16
17Rebase to 0.170 17Rebase to 0.170
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19
20--- 19---
21 backends/aarch64_initreg.c | 4 ++-- 20 backends/aarch64_initreg.c | 4 ++--
22 backends/arm_initreg.c | 2 +- 21 backends/arm_initreg.c | 2 +-
diff --git a/meta/recipes-devtools/elfutils/files/ptest.patch b/meta/recipes-devtools/elfutils/files/ptest.patch
index fe6f272a83..2152875d63 100644
--- a/meta/recipes-devtools/elfutils/files/ptest.patch
+++ b/meta/recipes-devtools/elfutils/files/ptest.patch
@@ -1,4 +1,4 @@
1From bfbf393e7d5b1b41df85ce1c37e887776c45d529 Mon Sep 17 00:00:00 2001 1From d49f6a135762ec1f1831d0e80b8df2a4269b0a66 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 16:37:48 +0100 3Date: Wed, 1 May 2019 16:37:48 +0100
4Subject: [PATCH] Changes to allow ptest to run standalone on target: 4Subject: [PATCH] Changes to allow ptest to run standalone on target:
@@ -14,7 +14,6 @@ d) Add an oecheck make target which we can use to build the test binaries we nee
14Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 14Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
15 15
16Upstream-Status: Inappropriate [oe specific] 16Upstream-Status: Inappropriate [oe specific]
17
18--- 17---
19 configure.ac | 2 +- 18 configure.ac | 2 +-
20 tests/Makefile.am | 2 ++ 19 tests/Makefile.am | 2 ++
@@ -22,10 +21,10 @@ Upstream-Status: Inappropriate [oe specific]
22 3 files changed, 3 insertions(+), 7 deletions(-) 21 3 files changed, 3 insertions(+), 7 deletions(-)
23 22
24diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
25index d345495..67933d1 100644 24index bbe8673..488712b 100644
26--- a/configure.ac 25--- a/configure.ac
27+++ b/configure.ac 26+++ b/configure.ac
28@@ -48,7 +48,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2021 The elfutils developers.]) 27@@ -49,7 +49,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2024 The elfutils developers.])
29 AC_PREREQ(2.63) dnl Minimum Autoconf version required. 28 AC_PREREQ(2.63) dnl Minimum Autoconf version required.
30 29
31 dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. 30 dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
@@ -35,10 +34,10 @@ index d345495..67933d1 100644
35 34
36 AM_SILENT_RULES([yes]) 35 AM_SILENT_RULES([yes])
37diff --git a/tests/Makefile.am b/tests/Makefile.am 36diff --git a/tests/Makefile.am b/tests/Makefile.am
38index 72afd0e..a2dfd43 100644 37index ee49d07..3bd8e58 100644
39--- a/tests/Makefile.am 38--- a/tests/Makefile.am
40+++ b/tests/Makefile.am 39+++ b/tests/Makefile.am
41@@ -698,3 +698,5 @@ check: check-am coverage 40@@ -852,3 +852,5 @@ check: check-am coverage
42 coverage: 41 coverage:
43 -$(srcdir)/coverage.sh 42 -$(srcdir)/coverage.sh
44 endif 43 endif