summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch1163
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch41
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff492
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch128
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch1051
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0001-fix-a-stack-usage-warning.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0001-remove-the-unneed-checking.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/aarch64_uio.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0001-Ignore-differences-between-mips-machine-identifiers.patch)13
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch)3
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/0003-Add-mips-n64-relocation-format-hack.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/0003-Add-mips-n64-relocation-format-hack.patch)35
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/arm_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/arm_backend.diff)55
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/hppa_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/hppa_backend.diff)63
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch17
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff14
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/kfreebsd_path.patch)11
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/mips_backend.diff)75
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_readelf_w.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/mips_readelf_w.patch)11
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/testsuite-ignore-elflint.diff)17
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/fixheadercheck.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.166/shadow.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.168.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.166.bb)29
23 files changed, 1237 insertions, 1981 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
deleted file mode 100644
index 38b31f6a8d..0000000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
+++ /dev/null
@@ -1,1163 +0,0 @@
1From 4b0fe80b3951f044c1c1b14d1d7f5f0b8ab67507 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 06:35:34 +0000
4Subject: [PATCH] build: Provide alternatives for glibc assumptions helps
5 compiling it on musl
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9Upstream-Status: Pending
10
11 Makefile.am | 2 +-
12 lib/color.c | 2 +-
13 lib/crc32_file.c | 4 +++-
14 lib/fixedsizehash.h | 4 ++--
15 lib/system.h | 11 +++++++++++
16 lib/xmalloc.c | 2 +-
17 libasm/asm_end.c | 2 +-
18 libasm/asm_newscn.c | 2 +-
19 libcpu/i386_gendis.c | 2 +-
20 libcpu/i386_lex.c | 2 +-
21 libcpu/i386_parse.c | 2 +-
22 libdw/Makefile.am | 2 +-
23 libdw/libdw_alloc.c | 3 ++-
24 libdwfl/Makefile.am | 2 ++
25 libdwfl/dwfl_build_id_find_elf.c | 3 ++-
26 libdwfl/dwfl_error.c | 4 +++-
27 libdwfl/dwfl_module_getdwarf.c | 1 +
28 libdwfl/find-debuginfo.c | 2 +-
29 libdwfl/libdwfl_crc32_file.c | 10 ++++++++++
30 libdwfl/linux-kernel-modules.c | 1 +
31 libebl/eblopenbackend.c | 2 +-
32 libebl/eblwstrtab.c | 2 +-
33 libelf/elf.h | 9 ++++++---
34 libelf/libelf.h | 1 +
35 libelf/libelfP.h | 1 +
36 src/addr2line.c | 2 +-
37 src/ar.c | 2 +-
38 src/arlib.c | 2 +-
39 src/arlib2.c | 2 +-
40 src/elfcmp.c | 2 +-
41 src/elflint.c | 2 +-
42 src/findtextrel.c | 2 +-
43 src/i386_ld.c | 2 +-
44 src/ld.c | 2 +-
45 src/ldgeneric.c | 2 +-
46 src/ldlex.c | 2 +-
47 src/ldscript.c | 2 +-
48 src/nm.c | 2 +-
49 src/objdump.c | 2 +-
50 src/ranlib.c | 2 +-
51 src/readelf.c | 2 +-
52 src/size.c | 2 +-
53 src/stack.c | 2 +-
54 src/strings.c | 2 +-
55 src/strip.c | 2 +-
56 src/unstrip.c | 2 +-
57 tests/addrscopes.c | 2 +-
58 tests/allregs.c | 2 +-
59 tests/backtrace-data.c | 2 +-
60 tests/backtrace-dwarf.c | 2 +-
61 tests/backtrace.c | 2 +-
62 tests/buildid.c | 2 +-
63 tests/debugaltlink.c | 2 +-
64 tests/debuglink.c | 2 +-
65 tests/deleted.c | 2 +-
66 tests/dwfl-addr-sect.c | 2 +-
67 tests/dwfl-bug-addr-overflow.c | 2 +-
68 tests/dwfl-bug-fd-leak.c | 2 +-
69 tests/dwfl-bug-getmodules.c | 2 +-
70 tests/dwfl-report-elf-align.c | 2 +-
71 tests/dwfllines.c | 2 +-
72 tests/dwflmodtest.c | 2 +-
73 tests/dwflsyms.c | 2 +-
74 tests/early-offscn.c | 2 +-
75 tests/ecp.c | 2 +-
76 tests/find-prologues.c | 2 +-
77 tests/funcretval.c | 2 +-
78 tests/funcscopes.c | 2 +-
79 tests/getsrc_die.c | 2 +-
80 tests/line2addr.c | 2 +-
81 tests/low_high_pc.c | 2 +-
82 tests/md5-sha1-test.c | 2 +-
83 tests/rdwrmmap.c | 2 +-
84 tests/saridx.c | 2 +-
85 tests/sectiondump.c | 2 +-
86 tests/varlocs.c | 2 +-
87 tests/vdsosyms.c | 2 +-
88 77 files changed, 109 insertions(+), 73 deletions(-)
89
90Index: elfutils-0.166/Makefile.am
91===================================================================
92--- elfutils-0.166.orig/Makefile.am
93+++ elfutils-0.166/Makefile.am
94@@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h
95
96 # Add doc back when we have some real content.
97 SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
98- backends src po tests
99+ backends po tests
100
101 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
102 COPYING COPYING-GPLV2 COPYING-LGPLV3
103Index: elfutils-0.166/lib/color.c
104===================================================================
105--- elfutils-0.166.orig/lib/color.c
106+++ elfutils-0.166/lib/color.c
107@@ -32,7 +32,7 @@
108 #endif
109
110 #include <argp.h>
111-#include <error.h>
112+#include <err.h>
113 #include <libintl.h>
114 #include <stdlib.h>
115 #include <string.h>
116Index: elfutils-0.166/lib/crc32_file.c
117===================================================================
118--- elfutils-0.166.orig/lib/crc32_file.c
119+++ elfutils-0.166/lib/crc32_file.c
120@@ -30,12 +30,14 @@
121 # include <config.h>
122 #endif
123
124-#include "system.h"
125 #include <errno.h>
126 #include <unistd.h>
127+#include <stdint.h>
128 #include <sys/stat.h>
129 #include <sys/mman.h>
130
131+#include "system.h"
132+
133 int
134 crc32_file (int fd, uint32_t *resp)
135 {
136Index: elfutils-0.166/lib/fixedsizehash.h
137===================================================================
138--- elfutils-0.166.orig/lib/fixedsizehash.h
139+++ elfutils-0.166/lib/fixedsizehash.h
140@@ -30,12 +30,12 @@
141 #include <errno.h>
142 #include <stdlib.h>
143 #include <string.h>
144-#include <sys/cdefs.h>
145 #include <sys/param.h>
146
147 #include <system.h>
148
149-#define CONCAT(t1,t2) __CONCAT (t1,t2)
150+#define CONCAT1(x,y) x##y
151+#define CONCAT(x,y) CONCAT1(x,y)
152
153 /* Before including this file the following macros must be defined:
154
155Index: elfutils-0.166/lib/system.h
156===================================================================
157--- elfutils-0.166.orig/lib/system.h
158+++ elfutils-0.166/lib/system.h
159@@ -49,6 +49,16 @@
160 #else
161 # error "Unknown byte order"
162 #endif
163+#ifndef TEMP_FAILURE_RETRY
164+#define TEMP_FAILURE_RETRY(expression) \
165+ (__extension__ \
166+ ({ long int __result; \
167+ do __result = (long int) (expression); \
168+ while (__result == -1L && errno == EINTR); \
169+ __result; }))
170+#endif
171+
172+#define error(status, errno, ...) err(status, __VA_ARGS__)
173
174 extern void *xmalloc (size_t) __attribute__ ((__malloc__));
175 extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
176Index: elfutils-0.166/lib/xmalloc.c
177===================================================================
178--- elfutils-0.166.orig/lib/xmalloc.c
179+++ elfutils-0.166/lib/xmalloc.c
180@@ -30,7 +30,7 @@
181 # include <config.h>
182 #endif
183
184-#include <error.h>
185+#include <err.h>
186 #include <libintl.h>
187 #include <stddef.h>
188 #include <stdlib.h>
189Index: elfutils-0.166/libasm/asm_end.c
190===================================================================
191--- elfutils-0.166.orig/libasm/asm_end.c
192+++ elfutils-0.166/libasm/asm_end.c
193@@ -32,7 +32,7 @@
194 #endif
195
196 #include <assert.h>
197-#include <error.h>
198+#include <err.h>
199 #include <libintl.h>
200 #include <stdio.h>
201 #include <stdlib.h>
202Index: elfutils-0.166/libasm/asm_newscn.c
203===================================================================
204--- elfutils-0.166.orig/libasm/asm_newscn.c
205+++ elfutils-0.166/libasm/asm_newscn.c
206@@ -32,7 +32,7 @@
207 #endif
208
209 #include <assert.h>
210-#include <error.h>
211+#include <err.h>
212 #include <libintl.h>
213 #include <stdlib.h>
214 #include <string.h>
215Index: elfutils-0.166/libcpu/i386_gendis.c
216===================================================================
217--- elfutils-0.166.orig/libcpu/i386_gendis.c
218+++ elfutils-0.166/libcpu/i386_gendis.c
219@@ -31,7 +31,7 @@
220 # include <config.h>
221 #endif
222
223-#include <error.h>
224+#include <err.h>
225 #include <errno.h>
226 #include <stdio.h>
227 #include <stdlib.h>
228Index: elfutils-0.166/libcpu/i386_lex.c
229===================================================================
230--- elfutils-0.166.orig/libcpu/i386_lex.c
231+++ elfutils-0.166/libcpu/i386_lex.c
232@@ -578,7 +578,7 @@ char *i386_text;
233 #endif
234
235 #include <ctype.h>
236-#include <error.h>
237+#include <err.h>
238 #include <libintl.h>
239
240 #include <system.h>
241Index: elfutils-0.166/libcpu/i386_parse.c
242===================================================================
243--- elfutils-0.166.orig/libcpu/i386_parse.c
244+++ elfutils-0.166/libcpu/i386_parse.c
245@@ -107,7 +107,7 @@
246 #include <assert.h>
247 #include <ctype.h>
248 #include <errno.h>
249-#include <error.h>
250+#include <err.h>
251 #include <inttypes.h>
252 #include <libintl.h>
253 #include <math.h>
254Index: elfutils-0.166/libdw/Makefile.am
255===================================================================
256--- elfutils-0.166.orig/libdw/Makefile.am
257+++ elfutils-0.166/libdw/Makefile.am
258@@ -117,7 +117,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
259 -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
260 -Wl,--version-script,$<,--no-undefined \
261 -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
262- -ldl -lz $(argp_LDADD) $(zip_LIBS) $(libdw_so_LDLIBS)
263+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(libdw_so_LDLIBS) -lfts -largp
264 @$(textrel_check)
265 $(AM_V_at)ln -fs $@ $@.$(VERSION)
266
267Index: elfutils-0.166/libdw/libdw_alloc.c
268===================================================================
269--- elfutils-0.166.orig/libdw/libdw_alloc.c
270+++ elfutils-0.166/libdw/libdw_alloc.c
271@@ -31,11 +31,12 @@
272 # include <config.h>
273 #endif
274
275-#include <error.h>
276+#include <err.h>
277 #include <errno.h>
278 #include <stdlib.h>
279 #include <sys/param.h>
280 #include "libdwP.h"
281+#include "system.h"
282
283
284 void *
285Index: elfutils-0.166/libdwfl/Makefile.am
286===================================================================
287--- elfutils-0.166.orig/libdwfl/Makefile.am
288+++ elfutils-0.166/libdwfl/Makefile.am
289@@ -84,6 +84,8 @@ libelf = ../libelf/libelf.so
290 libebl = ../libebl/libebl.a
291 libeu = ../lib/libeu.a
292
293+LDADD = -lfts
294+
295 libdwfl_pic_a_SOURCES =
296 am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os)
297
298Index: elfutils-0.166/libdwfl/dwfl_build_id_find_elf.c
299===================================================================
300--- elfutils-0.166.orig/libdwfl/dwfl_build_id_find_elf.c
301+++ elfutils-0.166/libdwfl/dwfl_build_id_find_elf.c
302@@ -27,6 +27,7 @@
303 not, see <http://www.gnu.org/licenses/>. */
304
305 #include "libdwflP.h"
306+#include "system.h"
307 #include <inttypes.h>
308 #include <fcntl.h>
309 #include <unistd.h>
310@@ -94,7 +95,7 @@ __libdwfl_open_by_build_id (Dwfl_Module
311 {
312 if (*file_name != NULL)
313 free (*file_name);
314- *file_name = canonicalize_file_name (name);
315+ *file_name = realpath (name, NULL);
316 if (*file_name == NULL)
317 {
318 *file_name = name;
319Index: elfutils-0.166/libdwfl/dwfl_error.c
320===================================================================
321--- elfutils-0.166.orig/libdwfl/dwfl_error.c
322+++ elfutils-0.166/libdwfl/dwfl_error.c
323@@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error)
324 const char *
325 dwfl_errmsg (int error)
326 {
327+ static __thread char s[64] = "";
328 if (error == 0 || error == -1)
329 {
330 int last_error = global_error;
331@@ -154,7 +155,8 @@ dwfl_errmsg (int error)
332 switch (error &~ 0xffff)
333 {
334 case OTHER_ERROR (ERRNO):
335- return strerror_r (error & 0xffff, "bad", 0);
336+ strerror_r (error & 0xffff, s, sizeof(s));
337+ return s;
338 case OTHER_ERROR (LIBELF):
339 return elf_errmsg (error & 0xffff);
340 case OTHER_ERROR (LIBDW):
341Index: elfutils-0.166/libdwfl/dwfl_module_getdwarf.c
342===================================================================
343--- elfutils-0.166.orig/libdwfl/dwfl_module_getdwarf.c
344+++ elfutils-0.166/libdwfl/dwfl_module_getdwarf.c
345@@ -31,6 +31,7 @@
346 #include <fcntl.h>
347 #include <string.h>
348 #include <unistd.h>
349+#include "system.h"
350 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
351 #include "../libelf/libelfP.h"
352
353Index: elfutils-0.166/libdwfl/find-debuginfo.c
354===================================================================
355--- elfutils-0.166.orig/libdwfl/find-debuginfo.c
356+++ elfutils-0.166/libdwfl/find-debuginfo.c
357@@ -385,7 +385,7 @@ dwfl_standard_find_debuginfo (Dwfl_Modul
358 /* If FILE_NAME is a symlink, the debug file might be associated
359 with the symlink target name instead. */
360
361- char *canon = canonicalize_file_name (file_name);
362+ char *canon = realpath (file_name, NULL);
363 if (canon != NULL && strcmp (file_name, canon))
364 fd = find_debuginfo_in_path (mod, canon,
365 debuglink_file, debuglink_crc,
366Index: elfutils-0.166/libdwfl/libdwfl_crc32_file.c
367===================================================================
368--- elfutils-0.166.orig/libdwfl/libdwfl_crc32_file.c
369+++ elfutils-0.166/libdwfl/libdwfl_crc32_file.c
370@@ -31,6 +31,16 @@
371
372 #define crc32_file attribute_hidden __libdwfl_crc32_file
373 #define crc32 __libdwfl_crc32
374+
375+#ifndef TEMP_FAILURE_RETRY
376+#define TEMP_FAILURE_RETRY(expression) \
377+ (__extension__ \
378+ ({ long int __result; \
379+ do __result = (long int) (expression); \
380+ while (__result == -1L && errno == EINTR); \
381+ __result; }))
382+#endif
383+
384 #define LIB_SYSTEM_H 1
385 #include <libdwflP.h>
386 #include "../lib/crc32_file.c"
387Index: elfutils-0.166/libdwfl/linux-kernel-modules.c
388===================================================================
389--- elfutils-0.166.orig/libdwfl/linux-kernel-modules.c
390+++ elfutils-0.166/libdwfl/linux-kernel-modules.c
391@@ -34,6 +34,7 @@
392 #include <config.h>
393
394 #include "libdwflP.h"
395+#include "system.h"
396 #include <inttypes.h>
397 #include <errno.h>
398 #include <stdio.h>
399Index: elfutils-0.166/libebl/eblopenbackend.c
400===================================================================
401--- elfutils-0.166.orig/libebl/eblopenbackend.c
402+++ elfutils-0.166/libebl/eblopenbackend.c
403@@ -32,7 +32,7 @@
404
405 #include <assert.h>
406 #include <dlfcn.h>
407-#include <error.h>
408+#include <err.h>
409 #include <libelfP.h>
410 #include <dwarf.h>
411 #include <stdlib.h>
412Index: elfutils-0.166/libebl/eblwstrtab.c
413===================================================================
414--- elfutils-0.166.orig/libebl/eblwstrtab.c
415+++ elfutils-0.166/libebl/eblwstrtab.c
416@@ -305,7 +305,7 @@ copystrings (struct Ebl_WStrent *nodep,
417
418 /* Process the current node. */
419 nodep->offset = *offsetp;
420- *freep = wmempcpy (*freep, nodep->string, nodep->len);
421+ *freep = wmemcpy (*freep, nodep->string, nodep->len) + nodep->len;
422 *offsetp += nodep->len * sizeof (wchar_t);
423
424 for (subs = nodep->next; subs != NULL; subs = subs->next)
425Index: elfutils-0.166/libelf/elf.h
426===================================================================
427--- elfutils-0.166.orig/libelf/elf.h
428+++ elfutils-0.166/libelf/elf.h
429@@ -21,7 +21,9 @@
430
431 #include <features.h>
432
433-__BEGIN_DECLS
434+#ifdef __cplusplus
435+extern "C" {
436+#endif
437
438 /* Standard ELF types. */
439
440@@ -3591,7 +3593,8 @@ enum
441
442 #define R_TILEGX_NUM 130
443
444-
445-__END_DECLS
446+#ifdef __cplusplus
447+}
448+#endif
449
450 #endif /* elf.h */
451Index: elfutils-0.166/libelf/libelf.h
452===================================================================
453--- elfutils-0.166.orig/libelf/libelf.h
454+++ elfutils-0.166/libelf/libelf.h
455@@ -29,6 +29,7 @@
456 #ifndef _LIBELF_H
457 #define _LIBELF_H 1
458
459+#include <fcntl.h>
460 #include <stdint.h>
461 #include <sys/types.h>
462
463Index: elfutils-0.166/libelf/libelfP.h
464===================================================================
465--- elfutils-0.166.orig/libelf/libelfP.h
466+++ elfutils-0.166/libelf/libelfP.h
467@@ -36,6 +36,7 @@
468
469 #include <ar.h>
470 #include <gelf.h>
471+#include <libelf.h>
472
473 #include <errno.h>
474 #include <stdbool.h>
475Index: elfutils-0.166/src/addr2line.c
476===================================================================
477--- elfutils-0.166.orig/src/addr2line.c
478+++ elfutils-0.166/src/addr2line.c
479@@ -23,7 +23,7 @@
480 #include <argp.h>
481 #include <assert.h>
482 #include <errno.h>
483-#include <error.h>
484+#include <err.h>
485 #include <fcntl.h>
486 #include <inttypes.h>
487 #include <libdwfl.h>
488Index: elfutils-0.166/src/ar.c
489===================================================================
490--- elfutils-0.166.orig/src/ar.c
491+++ elfutils-0.166/src/ar.c
492@@ -22,7 +22,7 @@
493
494 #include <argp.h>
495 #include <assert.h>
496-#include <error.h>
497+#include <err.h>
498 #include <fcntl.h>
499 #include <gelf.h>
500 #include <libintl.h>
501Index: elfutils-0.166/src/arlib.c
502===================================================================
503--- elfutils-0.166.orig/src/arlib.c
504+++ elfutils-0.166/src/arlib.c
505@@ -21,7 +21,7 @@
506 #endif
507
508 #include <assert.h>
509-#include <error.h>
510+#include <err.h>
511 #include <gelf.h>
512 #include <libintl.h>
513 #include <stdio.h>
514Index: elfutils-0.166/src/arlib2.c
515===================================================================
516--- elfutils-0.166.orig/src/arlib2.c
517+++ elfutils-0.166/src/arlib2.c
518@@ -20,7 +20,7 @@
519 # include <config.h>
520 #endif
521
522-#include <error.h>
523+#include <err.h>
524 #include <libintl.h>
525 #include <limits.h>
526 #include <string.h>
527Index: elfutils-0.166/src/elfcmp.c
528===================================================================
529--- elfutils-0.166.orig/src/elfcmp.c
530+++ elfutils-0.166/src/elfcmp.c
531@@ -23,7 +23,7 @@
532 #include <argp.h>
533 #include <assert.h>
534 #include <errno.h>
535-#include <error.h>
536+#include <err.h>
537 #include <fcntl.h>
538 #include <locale.h>
539 #include <libintl.h>
540Index: elfutils-0.166/src/elflint.c
541===================================================================
542--- elfutils-0.166.orig/src/elflint.c
543+++ elfutils-0.166/src/elflint.c
544@@ -24,7 +24,7 @@
545 #include <assert.h>
546 #include <byteswap.h>
547 #include <endian.h>
548-#include <error.h>
549+#include <err.h>
550 #include <fcntl.h>
551 #include <gelf.h>
552 #include <inttypes.h>
553Index: elfutils-0.166/src/findtextrel.c
554===================================================================
555--- elfutils-0.166.orig/src/findtextrel.c
556+++ elfutils-0.166/src/findtextrel.c
557@@ -23,7 +23,7 @@
558 #include <argp.h>
559 #include <assert.h>
560 #include <errno.h>
561-#include <error.h>
562+#include <err.h>
563 #include <fcntl.h>
564 #include <gelf.h>
565 #include <libdw.h>
566Index: elfutils-0.166/src/i386_ld.c
567===================================================================
568--- elfutils-0.166.orig/src/i386_ld.c
569+++ elfutils-0.166/src/i386_ld.c
570@@ -20,7 +20,7 @@
571 #endif
572
573 #include <assert.h>
574-#include <error.h>
575+#include <err.h>
576 #include <libintl.h>
577 #include <stdlib.h>
578 #include <string.h>
579Index: elfutils-0.166/src/ld.c
580===================================================================
581--- elfutils-0.166.orig/src/ld.c
582+++ elfutils-0.166/src/ld.c
583@@ -21,7 +21,7 @@
584
585 #include <argp.h>
586 #include <assert.h>
587-#include <error.h>
588+#include <err.h>
589 #include <fcntl.h>
590 #include <libelf.h>
591 #include <libintl.h>
592Index: elfutils-0.166/src/ldgeneric.c
593===================================================================
594--- elfutils-0.166.orig/src/ldgeneric.c
595+++ elfutils-0.166/src/ldgeneric.c
596@@ -23,7 +23,7 @@
597 #include <ctype.h>
598 #include <dlfcn.h>
599 #include <errno.h>
600-#include <error.h>
601+#include <err.h>
602 #include <fcntl.h>
603 #include <fnmatch.h>
604 #include <gelf.h>
605Index: elfutils-0.166/src/ldlex.c
606===================================================================
607--- elfutils-0.166.orig/src/ldlex.c
608+++ elfutils-0.166/src/ldlex.c
609@@ -1106,7 +1106,7 @@ char *ldtext;
610 #include <assert.h>
611 #include <ctype.h>
612 #include <elf.h>
613-#include <error.h>
614+#include <err.h>
615 #include <inttypes.h>
616 #include <libintl.h>
617 #include <stdbool.h>
618Index: elfutils-0.166/src/ldscript.c
619===================================================================
620--- elfutils-0.166.orig/src/ldscript.c
621+++ elfutils-0.166/src/ldscript.c
622@@ -95,7 +95,7 @@
623 #endif
624
625 #include <assert.h>
626-#include <error.h>
627+#include <err.h>
628 #include <libintl.h>
629 #include <stdbool.h>
630 #include <stdint.h>
631Index: elfutils-0.166/src/nm.c
632===================================================================
633--- elfutils-0.166.orig/src/nm.c
634+++ elfutils-0.166/src/nm.c
635@@ -26,7 +26,7 @@
636 #include <ctype.h>
637 #include <dwarf.h>
638 #include <errno.h>
639-#include <error.h>
640+#include <err.h>
641 #include <fcntl.h>
642 #include <gelf.h>
643 #include <inttypes.h>
644Index: elfutils-0.166/src/objdump.c
645===================================================================
646--- elfutils-0.166.orig/src/objdump.c
647+++ elfutils-0.166/src/objdump.c
648@@ -21,7 +21,7 @@
649 #endif
650
651 #include <argp.h>
652-#include <error.h>
653+#include <err.h>
654 #include <fcntl.h>
655 #include <inttypes.h>
656 #include <libintl.h>
657Index: elfutils-0.166/src/ranlib.c
658===================================================================
659--- elfutils-0.166.orig/src/ranlib.c
660+++ elfutils-0.166/src/ranlib.c
661@@ -24,7 +24,7 @@
662 #include <argp.h>
663 #include <assert.h>
664 #include <errno.h>
665-#include <error.h>
666+#include <err.h>
667 #include <fcntl.h>
668 #include <gelf.h>
669 #include <libintl.h>
670Index: elfutils-0.166/src/readelf.c
671===================================================================
672--- elfutils-0.166.orig/src/readelf.c
673+++ elfutils-0.166/src/readelf.c
674@@ -25,7 +25,7 @@
675 #include <ctype.h>
676 #include <dwarf.h>
677 #include <errno.h>
678-#include <error.h>
679+#include <err.h>
680 #include <fcntl.h>
681 #include <gelf.h>
682 #include <inttypes.h>
683Index: elfutils-0.166/src/size.c
684===================================================================
685--- elfutils-0.166.orig/src/size.c
686+++ elfutils-0.166/src/size.c
687@@ -21,7 +21,7 @@
688 #endif
689
690 #include <argp.h>
691-#include <error.h>
692+#include <err.h>
693 #include <fcntl.h>
694 #include <gelf.h>
695 #include <inttypes.h>
696Index: elfutils-0.166/src/stack.c
697===================================================================
698--- elfutils-0.166.orig/src/stack.c
699+++ elfutils-0.166/src/stack.c
700@@ -18,7 +18,7 @@
701 #include <config.h>
702 #include <assert.h>
703 #include <argp.h>
704-#include <error.h>
705+#include <err.h>
706 #include <stdlib.h>
707 #include <inttypes.h>
708 #include <stdio.h>
709Index: elfutils-0.166/src/strings.c
710===================================================================
711--- elfutils-0.166.orig/src/strings.c
712+++ elfutils-0.166/src/strings.c
713@@ -25,7 +25,7 @@
714 #include <ctype.h>
715 #include <endian.h>
716 #include <errno.h>
717-#include <error.h>
718+#include <err.h>
719 #include <fcntl.h>
720 #include <gelf.h>
721 #include <inttypes.h>
722Index: elfutils-0.166/src/strip.c
723===================================================================
724--- elfutils-0.166.orig/src/strip.c
725+++ elfutils-0.166/src/strip.c
726@@ -24,7 +24,7 @@
727 #include <assert.h>
728 #include <byteswap.h>
729 #include <endian.h>
730-#include <error.h>
731+#include <err.h>
732 #include <fcntl.h>
733 #include <gelf.h>
734 #include <libelf.h>
735Index: elfutils-0.166/src/unstrip.c
736===================================================================
737--- elfutils-0.166.orig/src/unstrip.c
738+++ elfutils-0.166/src/unstrip.c
739@@ -31,7 +31,7 @@
740 #include <argp.h>
741 #include <assert.h>
742 #include <errno.h>
743-#include <error.h>
744+#include <err.h>
745 #include <fcntl.h>
746 #include <fnmatch.h>
747 #include <libintl.h>
748Index: elfutils-0.166/tests/addrscopes.c
749===================================================================
750--- elfutils-0.166.orig/tests/addrscopes.c
751+++ elfutils-0.166/tests/addrscopes.c
752@@ -25,7 +25,7 @@
753 #include <stdio_ext.h>
754 #include <locale.h>
755 #include <stdlib.h>
756-#include <error.h>
757+#include <err.h>
758 #include <string.h>
759
760
761Index: elfutils-0.166/tests/allregs.c
762===================================================================
763--- elfutils-0.166.orig/tests/allregs.c
764+++ elfutils-0.166/tests/allregs.c
765@@ -21,7 +21,7 @@
766 #include <stdio.h>
767 #include <stdlib.h>
768 #include <string.h>
769-#include <error.h>
770+#include <err.h>
771 #include <locale.h>
772 #include <argp.h>
773 #include <assert.h>
774Index: elfutils-0.166/tests/backtrace-data.c
775===================================================================
776--- elfutils-0.166.orig/tests/backtrace-data.c
777+++ elfutils-0.166/tests/backtrace-data.c
778@@ -27,7 +27,7 @@
779 #include <dirent.h>
780 #include <stdlib.h>
781 #include <errno.h>
782-#include <error.h>
783+#include <err.h>
784 #include <unistd.h>
785 #include <dwarf.h>
786 #if defined(__x86_64__) && defined(__linux__)
787Index: elfutils-0.166/tests/backtrace-dwarf.c
788===================================================================
789--- elfutils-0.166.orig/tests/backtrace-dwarf.c
790+++ elfutils-0.166/tests/backtrace-dwarf.c
791@@ -22,7 +22,7 @@
792 #include <stdio_ext.h>
793 #include <locale.h>
794 #include <errno.h>
795-#include <error.h>
796+#include <err.h>
797 #include <unistd.h>
798 #include <sys/ptrace.h>
799 #include <sys/types.h>
800Index: elfutils-0.166/tests/backtrace.c
801===================================================================
802--- elfutils-0.166.orig/tests/backtrace.c
803+++ elfutils-0.166/tests/backtrace.c
804@@ -24,7 +24,7 @@
805 #include <dirent.h>
806 #include <stdlib.h>
807 #include <errno.h>
808-#include <error.h>
809+#include <err.h>
810 #include <unistd.h>
811 #include <dwarf.h>
812 #ifdef __linux__
813Index: elfutils-0.166/tests/buildid.c
814===================================================================
815--- elfutils-0.166.orig/tests/buildid.c
816+++ elfutils-0.166/tests/buildid.c
817@@ -23,7 +23,7 @@
818 #include ELFUTILS_HEADER(elf)
819 #include ELFUTILS_HEADER(dwelf)
820 #include <stdio.h>
821-#include <error.h>
822+#include <err.h>
823 #include <string.h>
824 #include <stdlib.h>
825 #include <sys/types.h>
826Index: elfutils-0.166/tests/debugaltlink.c
827===================================================================
828--- elfutils-0.166.orig/tests/debugaltlink.c
829+++ elfutils-0.166/tests/debugaltlink.c
830@@ -23,7 +23,7 @@
831 #include ELFUTILS_HEADER(dw)
832 #include ELFUTILS_HEADER(dwelf)
833 #include <stdio.h>
834-#include <error.h>
835+#include <err.h>
836 #include <string.h>
837 #include <stdlib.h>
838 #include <sys/types.h>
839Index: elfutils-0.166/tests/debuglink.c
840===================================================================
841--- elfutils-0.166.orig/tests/debuglink.c
842+++ elfutils-0.166/tests/debuglink.c
843@@ -21,7 +21,7 @@
844 #include <errno.h>
845 #include ELFUTILS_HEADER(dwelf)
846 #include <stdio.h>
847-#include <error.h>
848+#include <err.h>
849 #include <string.h>
850 #include <stdlib.h>
851 #include <sys/types.h>
852Index: elfutils-0.166/tests/deleted.c
853===================================================================
854--- elfutils-0.166.orig/tests/deleted.c
855+++ elfutils-0.166/tests/deleted.c
856@@ -21,7 +21,7 @@
857 #include <unistd.h>
858 #include <assert.h>
859 #include <stdio.h>
860-#include <error.h>
861+#include <err.h>
862 #include <errno.h>
863 #ifdef __linux__
864 #include <sys/prctl.h>
865Index: elfutils-0.166/tests/dwfl-addr-sect.c
866===================================================================
867--- elfutils-0.166.orig/tests/dwfl-addr-sect.c
868+++ elfutils-0.166/tests/dwfl-addr-sect.c
869@@ -23,7 +23,7 @@
870 #include <stdio_ext.h>
871 #include <stdlib.h>
872 #include <string.h>
873-#include <error.h>
874+#include <err.h>
875 #include <locale.h>
876 #include <argp.h>
877 #include ELFUTILS_HEADER(dwfl)
878Index: elfutils-0.166/tests/dwfl-bug-addr-overflow.c
879===================================================================
880--- elfutils-0.166.orig/tests/dwfl-bug-addr-overflow.c
881+++ elfutils-0.166/tests/dwfl-bug-addr-overflow.c
882@@ -20,7 +20,7 @@
883 #include <inttypes.h>
884 #include <stdio.h>
885 #include <stdio_ext.h>
886-#include <error.h>
887+#include <err.h>
888 #include <locale.h>
889 #include ELFUTILS_HEADER(dwfl)
890
891Index: elfutils-0.166/tests/dwfl-bug-fd-leak.c
892===================================================================
893--- elfutils-0.166.orig/tests/dwfl-bug-fd-leak.c
894+++ elfutils-0.166/tests/dwfl-bug-fd-leak.c
895@@ -24,7 +24,7 @@
896 #include <dirent.h>
897 #include <stdlib.h>
898 #include <errno.h>
899-#include <error.h>
900+#include <err.h>
901 #include <unistd.h>
902 #include <dwarf.h>
903
904Index: elfutils-0.166/tests/dwfl-bug-getmodules.c
905===================================================================
906--- elfutils-0.166.orig/tests/dwfl-bug-getmodules.c
907+++ elfutils-0.166/tests/dwfl-bug-getmodules.c
908@@ -18,7 +18,7 @@
909 #include <config.h>
910 #include ELFUTILS_HEADER(dwfl)
911
912-#include <error.h>
913+#include <err.h>
914
915 static const Dwfl_Callbacks callbacks =
916 {
917Index: elfutils-0.166/tests/dwfl-report-elf-align.c
918===================================================================
919--- elfutils-0.166.orig/tests/dwfl-report-elf-align.c
920+++ elfutils-0.166/tests/dwfl-report-elf-align.c
921@@ -20,7 +20,7 @@
922 #include <inttypes.h>
923 #include <stdio.h>
924 #include <stdio_ext.h>
925-#include <error.h>
926+#include <err.h>
927 #include <locale.h>
928 #include <string.h>
929 #include <stdlib.h>
930Index: elfutils-0.166/tests/dwfllines.c
931===================================================================
932--- elfutils-0.166.orig/tests/dwfllines.c
933+++ elfutils-0.166/tests/dwfllines.c
934@@ -27,7 +27,7 @@
935 #include <stdio.h>
936 #include <stdlib.h>
937 #include <string.h>
938-#include <error.h>
939+#include <err.h>
940
941 int
942 main (int argc, char *argv[])
943Index: elfutils-0.166/tests/dwflmodtest.c
944===================================================================
945--- elfutils-0.166.orig/tests/dwflmodtest.c
946+++ elfutils-0.166/tests/dwflmodtest.c
947@@ -23,7 +23,7 @@
948 #include <stdio_ext.h>
949 #include <stdlib.h>
950 #include <string.h>
951-#include <error.h>
952+#include <err.h>
953 #include <locale.h>
954 #include <argp.h>
955 #include ELFUTILS_HEADER(dwfl)
956Index: elfutils-0.166/tests/dwflsyms.c
957===================================================================
958--- elfutils-0.166.orig/tests/dwflsyms.c
959+++ elfutils-0.166/tests/dwflsyms.c
960@@ -25,7 +25,7 @@
961 #include <stdio.h>
962 #include <stdio_ext.h>
963 #include <stdlib.h>
964-#include <error.h>
965+#include <err.h>
966 #include <string.h>
967
968 static const char *
969Index: elfutils-0.166/tests/early-offscn.c
970===================================================================
971--- elfutils-0.166.orig/tests/early-offscn.c
972+++ elfutils-0.166/tests/early-offscn.c
973@@ -19,7 +19,7 @@
974 #endif
975
976 #include <errno.h>
977-#include <error.h>
978+#include <err.h>
979 #include <fcntl.h>
980 #include <gelf.h>
981 #include <stdio.h>
982Index: elfutils-0.166/tests/ecp.c
983===================================================================
984--- elfutils-0.166.orig/tests/ecp.c
985+++ elfutils-0.166/tests/ecp.c
986@@ -20,7 +20,7 @@
987 #endif
988
989 #include <errno.h>
990-#include <error.h>
991+#include <err.h>
992 #include <fcntl.h>
993 #include <gelf.h>
994 #include <stdlib.h>
995Index: elfutils-0.166/tests/find-prologues.c
996===================================================================
997--- elfutils-0.166.orig/tests/find-prologues.c
998+++ elfutils-0.166/tests/find-prologues.c
999@@ -25,7 +25,7 @@
1000 #include <stdio_ext.h>
1001 #include <locale.h>
1002 #include <stdlib.h>
1003-#include <error.h>
1004+#include <err.h>
1005 #include <string.h>
1006 #include <fnmatch.h>
1007
1008Index: elfutils-0.166/tests/funcretval.c
1009===================================================================
1010--- elfutils-0.166.orig/tests/funcretval.c
1011+++ elfutils-0.166/tests/funcretval.c
1012@@ -25,7 +25,7 @@
1013 #include <stdio_ext.h>
1014 #include <locale.h>
1015 #include <stdlib.h>
1016-#include <error.h>
1017+#include <err.h>
1018 #include <string.h>
1019 #include <fnmatch.h>
1020
1021Index: elfutils-0.166/tests/funcscopes.c
1022===================================================================
1023--- elfutils-0.166.orig/tests/funcscopes.c
1024+++ elfutils-0.166/tests/funcscopes.c
1025@@ -25,7 +25,7 @@
1026 #include <stdio_ext.h>
1027 #include <locale.h>
1028 #include <stdlib.h>
1029-#include <error.h>
1030+#include <err.h>
1031 #include <string.h>
1032 #include <fnmatch.h>
1033
1034Index: elfutils-0.166/tests/getsrc_die.c
1035===================================================================
1036--- elfutils-0.166.orig/tests/getsrc_die.c
1037+++ elfutils-0.166/tests/getsrc_die.c
1038@@ -19,7 +19,7 @@
1039 #endif
1040
1041 #include <errno.h>
1042-#include <error.h>
1043+#include <err.h>
1044 #include <fcntl.h>
1045 #include <inttypes.h>
1046 #include <libelf.h>
1047Index: elfutils-0.166/tests/line2addr.c
1048===================================================================
1049--- elfutils-0.166.orig/tests/line2addr.c
1050+++ elfutils-0.166/tests/line2addr.c
1051@@ -26,7 +26,7 @@
1052 #include <locale.h>
1053 #include <stdlib.h>
1054 #include <string.h>
1055-#include <error.h>
1056+#include <err.h>
1057
1058
1059 static void
1060Index: elfutils-0.166/tests/low_high_pc.c
1061===================================================================
1062--- elfutils-0.166.orig/tests/low_high_pc.c
1063+++ elfutils-0.166/tests/low_high_pc.c
1064@@ -25,7 +25,7 @@
1065 #include <stdio_ext.h>
1066 #include <locale.h>
1067 #include <stdlib.h>
1068-#include <error.h>
1069+#include <err.h>
1070 #include <string.h>
1071 #include <fnmatch.h>
1072
1073Index: elfutils-0.166/tests/md5-sha1-test.c
1074===================================================================
1075--- elfutils-0.166.orig/tests/md5-sha1-test.c
1076+++ elfutils-0.166/tests/md5-sha1-test.c
1077@@ -19,7 +19,7 @@
1078 #endif
1079
1080 #include <string.h>
1081-#include <error.h>
1082+#include <err.h>
1083
1084 #include "md5.h"
1085 #include "sha1.h"
1086Index: elfutils-0.166/tests/rdwrmmap.c
1087===================================================================
1088--- elfutils-0.166.orig/tests/rdwrmmap.c
1089+++ elfutils-0.166/tests/rdwrmmap.c
1090@@ -19,7 +19,7 @@
1091 #endif
1092
1093 #include <errno.h>
1094-#include <error.h>
1095+#include <err.h>
1096 #include <stdio.h>
1097 #include <fcntl.h>
1098 #include <unistd.h>
1099Index: elfutils-0.166/tests/saridx.c
1100===================================================================
1101--- elfutils-0.166.orig/tests/saridx.c
1102+++ elfutils-0.166/tests/saridx.c
1103@@ -17,7 +17,7 @@
1104
1105 #include <config.h>
1106
1107-#include <error.h>
1108+#include <err.h>
1109 #include <fcntl.h>
1110 #include <gelf.h>
1111 #include <stdio.h>
1112Index: elfutils-0.166/tests/sectiondump.c
1113===================================================================
1114--- elfutils-0.166.orig/tests/sectiondump.c
1115+++ elfutils-0.166/tests/sectiondump.c
1116@@ -18,7 +18,7 @@
1117 #include <config.h>
1118
1119 #include <errno.h>
1120-#include <error.h>
1121+#include <err.h>
1122 #include <fcntl.h>
1123 #include <gelf.h>
1124 #include <inttypes.h>
1125Index: elfutils-0.166/tests/varlocs.c
1126===================================================================
1127--- elfutils-0.166.orig/tests/varlocs.c
1128+++ elfutils-0.166/tests/varlocs.c
1129@@ -25,7 +25,7 @@
1130 #include <dwarf.h>
1131 #include <stdio.h>
1132 #include <stdlib.h>
1133-#include <error.h>
1134+#include <err.h>
1135 #include <string.h>
1136 #include <sys/types.h>
1137 #include <sys/stat.h>
1138Index: elfutils-0.166/tests/vdsosyms.c
1139===================================================================
1140--- elfutils-0.166.orig/tests/vdsosyms.c
1141+++ elfutils-0.166/tests/vdsosyms.c
1142@@ -18,7 +18,7 @@
1143 #include <config.h>
1144 #include <assert.h>
1145 #include <errno.h>
1146-#include <error.h>
1147+#include <err.h>
1148 #include <inttypes.h>
1149 #include <stdio.h>
1150 #include <string.h>
1151Index: elfutils-0.166/libelf/elf_getarsym.c
1152===================================================================
1153--- elfutils-0.166.orig/libelf/elf_getarsym.c
1154+++ elfutils-0.166/libelf/elf_getarsym.c
1155@@ -302,7 +302,7 @@ elf_getarsym (Elf *elf, size_t *ptr)
1156 arsym[cnt].as_off = (*u32)[cnt];
1157
1158 arsym[cnt].as_hash = _dl_elf_hash (str_data);
1159- str_data = rawmemchr (str_data, '\0') + 1;
1160+ str_data = memchr (str_data, '\0', SIZE_MAX) + 1;
1161 }
1162
1163 /* At the end a special entry. */
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch b/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
deleted file mode 100644
index 6c150bb54c..0000000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 836a16fe5b5bab4a3afe2c991c104652775ce3a3 Mon Sep 17 00:00:00 2001
2From: David Abdurachmanov <davidlt@cern.ch>
3Date: Mon, 11 Apr 2016 16:00:57 +0200
4Subject: elfcmp: fix self-comparison error with GCC 6
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Noticed with Fedora 24 Alpha, gcc (GCC) 6.0.0 20160406
10(Red Hat 6.0.0-0.20).
11
12elfcmp.c: In function ‘main’:
13elfcmp.c:364:199: error: self-comparison always evaluates
14to false [-Werror=tautological-compare]
15 if (unlikely (name1 == NULL || name2 == NULL
16
17Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
18---
19
20Upstream-Status: Backport
21
22 src/ChangeLog | 4 ++++
23 src/elfcmp.c | 2 +-
24 2 files changed, 5 insertions(+), 1 deletion(-)
25
26diff --git a/src/elfcmp.c b/src/elfcmp.c
27index 852b92f..7b5d39c 100644
28--- a/src/elfcmp.c
29+++ b/src/elfcmp.c
30@@ -368,7 +368,7 @@ main (int argc, char *argv[])
31 && sym1->st_shndx != SHN_UNDEF)
32 || sym1->st_info != sym2->st_info
33 || sym1->st_other != sym2->st_other
34- || sym1->st_shndx != sym1->st_shndx))
35+ || sym1->st_shndx != sym2->st_shndx))
36 {
37 // XXX Do we want to allow reordered symbol tables?
38 symtab_mismatch:
39--
40cgit v0.12
41
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff
deleted file mode 100644
index d73855b601..0000000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff
+++ /dev/null
@@ -1,492 +0,0 @@
1From: Kurt Roeckx <kurt@roeckx.be>
2From: Thorsten Glaser <tg@mirbsd.de>
3Subject: m68k support
4
5Written by Kurt Roeckx, except for the retval support which was written
6by Thorsten Glaser
7
8
9Index: elfutils-0.164/backends/m68k_init.c
10===================================================================
11--- /dev/null
12+++ elfutils-0.164/backends/m68k_init.c
13@@ -0,0 +1,49 @@
14+/* Initialization of m68k specific backend library.
15+ Copyright (C) 2007 Kurt Roeckx <kurt@roeckx.be>
16+
17+ This software is free software; you can redistribute it and/or modify
18+ it under the terms of the GNU General Public License as published by the
19+ Free Software Foundation; version 2 of the License.
20+
21+ This softare is distributed in the hope that it will be useful, but
22+ WITHOUT ANY WARRANTY; without even the implied warranty of
23+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24+ General Public License for more details.
25+
26+ You should have received a copy of the GNU General Public License along
27+ with this software; if not, write to the Free Software Foundation,
28+ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
29+
30+*/
31+
32+#ifdef HAVE_CONFIG_H
33+# include <config.h>
34+#endif
35+
36+#define BACKEND m68k_
37+#define RELOC_PREFIX R_68K_
38+#include "libebl_CPU.h"
39+
40+/* This defines the common reloc hooks based on m68k_reloc.def. */
41+#include "common-reloc.c"
42+
43+
44+const char *
45+m68k_init (Elf *elf __attribute__ ((unused)),
46+ GElf_Half machine __attribute__ ((unused)),
47+ Ebl *eh,
48+ size_t ehlen)
49+{
50+ /* Check whether the Elf_BH object has a sufficent size. */
51+ if (ehlen < sizeof (Ebl))
52+ return NULL;
53+
54+ /* We handle it. */
55+ eh->name = "m68k";
56+ m68k_init_reloc (eh);
57+ HOOK (eh, reloc_simple_type);
58+ HOOK (eh, return_value_location);
59+ HOOK (eh, register_info);
60+
61+ return MODVERSION;
62+}
63Index: elfutils-0.164/backends/m68k_regs.c
64===================================================================
65--- /dev/null
66+++ elfutils-0.164/backends/m68k_regs.c
67@@ -0,0 +1,106 @@
68+/* Register names and numbers for m68k DWARF.
69+ Copyright (C) 2007 Kurt Roeckx <kurt@roeckx.be>
70+
71+ This software is free software; you can redistribute it and/or modify
72+ it under the terms of the GNU General Public License as published by the
73+ Free Software Foundation; version 2 of the License.
74+
75+ This software is distributed in the hope that it will be useful, but
76+ WITHOUT ANY WARRANTY; without even the implied warranty of
77+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
78+ General Public License for more details.
79+
80+ You should have received a copy of the GNU General Public License along
81+ with this software; if not, write to the Free Software Foundation,
82+ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
83+
84+ */
85+
86+#ifdef HAVE_CONFIG_H
87+# include <config.h>
88+#endif
89+
90+#include <string.h>
91+#include <dwarf.h>
92+
93+#define BACKEND m68k_
94+#include "libebl_CPU.h"
95+
96+ssize_t
97+m68k_register_info (Ebl *ebl __attribute__ ((unused)),
98+ int regno, char *name, size_t namelen,
99+ const char **prefix, const char **setname,
100+ int *bits, int *type)
101+{
102+ if (name == NULL)
103+ return 25;
104+
105+ if (regno < 0 || regno > 24 || namelen < 5)
106+ return -1;
107+
108+ *prefix = "%";
109+ *bits = 32;
110+ *type = (regno < 8 ? DW_ATE_signed
111+ : regno < 16 ? DW_ATE_address : DW_ATE_float);
112+
113+ if (regno < 8)
114+ {
115+ *setname = "integer";
116+ }
117+ else if (regno < 16)
118+ {
119+ *setname = "address";
120+ }
121+ else if (regno < 24)
122+ {
123+ *setname = "FPU";
124+ }
125+ else
126+ {
127+ *setname = "address";
128+ *type = DW_ATE_address;
129+ }
130+
131+ switch (regno)
132+ {
133+ case 0 ... 7:
134+ name[0] = 'd';
135+ name[1] = regno + '0';
136+ namelen = 2;
137+ break;
138+
139+ case 8 ... 13:
140+ name[0] = 'a';
141+ name[1] = regno - 8 + '0';
142+ namelen = 2;
143+ break;
144+
145+ case 14:
146+ name[0] = 'f';
147+ name[1] = 'p';
148+ namelen = 2;
149+ break;
150+
151+ case 15:
152+ name[0] = 's';
153+ name[1] = 'p';
154+ namelen = 2;
155+ break;
156+
157+ case 16 ... 23:
158+ name[0] = 'f';
159+ name[1] = 'p';
160+ name[2] = regno - 16 + '0';
161+ namelen = 3;
162+ break;
163+
164+ case 24:
165+ name[0] = 'p';
166+ name[1] = 'c';
167+ namelen = 2;
168+ }
169+
170+ name[namelen++] = '\0';
171+ return namelen;
172+}
173+
174Index: elfutils-0.164/backends/m68k_reloc.def
175===================================================================
176--- /dev/null
177+++ elfutils-0.164/backends/m68k_reloc.def
178@@ -0,0 +1,45 @@
179+/* List the relocation types for m68k. -*- C -*-
180+ Copyright (C) 2007 Kurt Roeckx <kurt@roeckx.be>
181+
182+ This software is free software; you can redistribute it and/or modify
183+ it under the terms of the GNU General Public License as published by the
184+ Free Software Foundation; version 2 of the License.
185+
186+ This software is distributed in the hope that it will be useful, but
187+ WITHOUT ANY WARRANTY; without even the implied warranty of
188+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
189+ General Public License for more details.
190+
191+ You should have received a copy of the GNU General Public License along
192+ with this software; if not, write to the Free Software Foundation,
193+ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
194+*/
195+
196+/* NAME, REL|EXEC|DYN */
197+
198+RELOC_TYPE (NONE, 0)
199+RELOC_TYPE (32, REL|EXEC|DYN)
200+RELOC_TYPE (16, REL)
201+RELOC_TYPE (8, REL)
202+RELOC_TYPE (PC32, REL|EXEC|DYN)
203+RELOC_TYPE (PC16, REL)
204+RELOC_TYPE (PC8, REL)
205+RELOC_TYPE (GOT32, REL)
206+RELOC_TYPE (GOT16, REL)
207+RELOC_TYPE (GOT8, REL)
208+RELOC_TYPE (GOT32O, REL)
209+RELOC_TYPE (GOT16O, REL)
210+RELOC_TYPE (GOT8O, REL)
211+RELOC_TYPE (PLT32, REL)
212+RELOC_TYPE (PLT16, REL)
213+RELOC_TYPE (PLT8, REL)
214+RELOC_TYPE (PLT32O, REL)
215+RELOC_TYPE (PLT16O, REL)
216+RELOC_TYPE (PLT8O, REL)
217+RELOC_TYPE (COPY, EXEC)
218+RELOC_TYPE (GLOB_DAT, EXEC|DYN)
219+RELOC_TYPE (JMP_SLOT, EXEC|DYN)
220+RELOC_TYPE (RELATIVE, EXEC|DYN)
221+RELOC_TYPE (GNU_VTINHERIT, REL)
222+RELOC_TYPE (GNU_VTENTRY, REL)
223+
224Index: elfutils-0.164/libelf/elf.h
225===================================================================
226--- elfutils-0.164.orig/libelf/elf.h
227+++ elfutils-0.164/libelf/elf.h
228@@ -1158,6 +1158,9 @@ typedef struct
229 #define R_68K_GLOB_DAT 20 /* Create GOT entry */
230 #define R_68K_JMP_SLOT 21 /* Create PLT entry */
231 #define R_68K_RELATIVE 22 /* Adjust by program base */
232+/* The next 2 are GNU extensions to enable C++ vtable garbage collection. */
233+#define R_68K_GNU_VTINHERIT 23
234+#define R_68K_GNU_VTENTRY 24
235 #define R_68K_TLS_GD32 25 /* 32 bit GOT offset for GD */
236 #define R_68K_TLS_GD16 26 /* 16 bit GOT offset for GD */
237 #define R_68K_TLS_GD8 27 /* 8 bit GOT offset for GD */
238Index: elfutils-0.164/backends/Makefile.am
239===================================================================
240--- elfutils-0.164.orig/backends/Makefile.am
241+++ elfutils-0.164/backends/Makefile.am
242@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
243
244
245 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
246- tilegx parisc mips
247+ tilegx parisc mips m68k
248 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
249 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
250 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
251 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
252- libebl_parisc_pic.a libebl_mips_pic.a
253+ libebl_parisc_pic.a libebl_mips_pic.a libebl_m68k_pic.a
254 noinst_LIBRARIES = $(libebl_pic)
255 noinst_DATA = $(libebl_pic:_pic.a=.so)
256
257@@ -120,6 +120,10 @@ mips_SRCS = mips_init.c mips_symbol.c mi
258 libebl_mips_pic_a_SOURCES = $(mips_SRCS)
259 am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os)
260
261+m68k_SRCS = m68k_init.c m68k_symbol.c m68k_regs.c m68k_retval.c
262+libebl_m68k_pic_a_SOURCES = $(m68k_SRCS)
263+am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os)
264+
265 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
266 @rm -f $(@:.so=.map)
267 $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \
268Index: elfutils-0.164/backends/m68k_symbol.c
269===================================================================
270--- /dev/null
271+++ elfutils-0.164/backends/m68k_symbol.c
272@@ -0,0 +1,43 @@
273+/* m68k specific symbolic name handling.
274+ Copyright (C) 2007 Kurt Roeckx <kurt@roeckx.be>
275+
276+ This software is free software; you can redistribute it and/or modify
277+ it under the terms of the GNU General Public License as published by the
278+ Free Software Foundation; version 2 of the License.
279+
280+ This software distributed in the hope that it will be useful, but
281+ WITHOUT ANY WARRANTY; without even the implied warranty of
282+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
283+ General Public License for more details.
284+
285+ You should have received a copy of the GNU General Public License along
286+ with this software; if not, write to the Free Software Foundation,
287+ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
288+*/
289+
290+#ifdef HAVE_CONFIG_H
291+# include <config.h>
292+#endif
293+
294+#include <elf.h>
295+#include <stddef.h>
296+
297+#define BACKEND m68k_
298+#include "libebl_CPU.h"
299+
300+/* Check for the simple reloc types. */
301+Elf_Type
302+m68k_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type)
303+{
304+ switch (type)
305+ {
306+ case R_68K_32:
307+ return ELF_T_SWORD;
308+ case R_68K_16:
309+ return ELF_T_HALF;
310+ case R_68K_8:
311+ return ELF_T_BYTE;
312+ default:
313+ return ELF_T_NUM;
314+ }
315+}
316Index: elfutils-0.164/backends/m68k_retval.c
317===================================================================
318--- /dev/null
319+++ elfutils-0.164/backends/m68k_retval.c
320@@ -0,0 +1,172 @@
321+/* Function return value location for Linux/m68k ABI.
322+ Copyright (C) 2005-2010 Red Hat, Inc.
323+ Copyright (c) 2011 Thorsten Glaser, Debian.
324+ This file is part of Red Hat elfutils.
325+
326+ Red Hat elfutils is free software; you can redistribute it and/or modify
327+ it under the terms of the GNU General Public License as published by the
328+ Free Software Foundation; version 2 of the License.
329+
330+ Red Hat elfutils is distributed in the hope that it will be useful, but
331+ WITHOUT ANY WARRANTY; without even the implied warranty of
332+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
333+ General Public License for more details.
334+
335+ You should have received a copy of the GNU General Public License along
336+ with Red Hat elfutils; if not, write to the Free Software Foundation,
337+ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
338+
339+ Red Hat elfutils is an included package of the Open Invention Network.
340+ An included package of the Open Invention Network is a package for which
341+ Open Invention Network licensees cross-license their patents. No patent
342+ license is granted, either expressly or impliedly, by designation as an
343+ included package. Should you wish to participate in the Open Invention
344+ Network licensing program, please visit www.openinventionnetwork.com
345+ <http://www.openinventionnetwork.com>. */
346+
347+#ifdef HAVE_CONFIG_H
348+# include <config.h>
349+#endif
350+
351+#include <assert.h>
352+#include <dwarf.h>
353+
354+#define BACKEND m68k_
355+#include "libebl_CPU.h"
356+
357+
358+/* %d0, or pair %d0, %d1, or %a0 */
359+static const Dwarf_Op loc_intreg[] =
360+ {
361+ { .atom = DW_OP_reg0 }, { .atom = DW_OP_piece, .number = 4 },
362+ { .atom = DW_OP_reg1 }, { .atom = DW_OP_piece, .number = 4 },
363+ };
364+static const Dwarf_Op loc_ptrreg[] =
365+ {
366+ { .atom = DW_OP_reg8 },
367+ };
368+#define nloc_intreg 1
369+#define nloc_intregpair 4
370+#define nloc_ptrreg 1
371+
372+/* %f0 */
373+static const Dwarf_Op loc_fpreg[] =
374+ {
375+ { .atom = DW_OP_reg16 }
376+ };
377+#define nloc_fpreg 1
378+
379+/* Structures are a bit more complicated - small structures are returned
380+ in %d0 / %d1 (-freg-struct-return which is enabled by default), large
381+ structures use %a1 (in constrast to the SYSV psABI which says %a0) as
382+ reentrant storage space indicator. */
383+static const Dwarf_Op loc_aggregate[] =
384+ {
385+ { .atom = DW_OP_breg9, .number = 0 }
386+ };
387+#define nloc_aggregate 1
388+
389+int
390+m68k_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
391+{
392+ Dwarf_Word size;
393+
394+ /* Start with the function's type, and get the DW_AT_type attribute,
395+ which is the type of the return value. */
396+
397+ Dwarf_Attribute attr_mem;
398+ Dwarf_Attribute *attr = dwarf_attr_integrate (functypedie, DW_AT_type,
399+ &attr_mem);
400+ if (attr == NULL)
401+ /* The function has no return value, like a `void' function in C. */
402+ return 0;
403+
404+ Dwarf_Die die_mem;
405+ Dwarf_Die *typedie = dwarf_formref_die (attr, &die_mem);
406+ int tag = dwarf_tag (typedie);
407+
408+ /* Follow typedefs and qualifiers to get to the actual type. */
409+ while (tag == DW_TAG_typedef
410+ || tag == DW_TAG_const_type || tag == DW_TAG_volatile_type
411+ || tag == DW_TAG_restrict_type)
412+ {
413+ attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem);
414+ typedie = dwarf_formref_die (attr, &die_mem);
415+ tag = dwarf_tag (typedie);
416+ }
417+
418+ switch (tag)
419+ {
420+ case -1:
421+ return -1;
422+
423+ case DW_TAG_subrange_type:
424+ if (! dwarf_hasattr_integrate (typedie, DW_AT_byte_size))
425+ {
426+ attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem);
427+ typedie = dwarf_formref_die (attr, &die_mem);
428+ tag = dwarf_tag (typedie);
429+ }
430+ /* Fall through. */
431+
432+ case DW_TAG_base_type:
433+ case DW_TAG_enumeration_type:
434+ case DW_TAG_pointer_type:
435+ case DW_TAG_ptr_to_member_type:
436+ if (dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_byte_size,
437+ &attr_mem), &size) != 0)
438+ {
439+ if (tag == DW_TAG_pointer_type || tag == DW_TAG_ptr_to_member_type)
440+ size = 4;
441+ else
442+ return -1;
443+ }
444+ if (tag == DW_TAG_pointer_type || tag == DW_TAG_ptr_to_member_type)
445+ {
446+ *locp = loc_ptrreg;
447+ return nloc_ptrreg;
448+ }
449+ if (tag == DW_TAG_base_type)
450+ {
451+ Dwarf_Word encoding;
452+ if (dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_encoding,
453+ &attr_mem),
454+ &encoding) != 0)
455+ return -1;
456+ if (encoding == DW_ATE_float)
457+ {
458+ /* XXX really 10? */
459+ if (size > 10)
460+ return -2;
461+ *locp = loc_fpreg;
462+ return nloc_fpreg;
463+ }
464+ }
465+ if (size <= 8)
466+ {
467+ intreg:
468+ /* XXX check endianness of dword pair, int64 vs aggregate */
469+ *locp = loc_intreg;
470+ return size <= 4 ? nloc_intreg : nloc_intregpair;
471+ }
472+
473+ aggregate:
474+ *locp = loc_aggregate;
475+ return nloc_aggregate;
476+
477+ case DW_TAG_structure_type:
478+ case DW_TAG_class_type:
479+ case DW_TAG_union_type:
480+ case DW_TAG_array_type:
481+ if (dwarf_aggregate_size (typedie, &size) == 0
482+ && size > 0 && size <= 8)
483+ /* not accurate for a struct whose only member is a float */
484+ goto intreg;
485+ goto aggregate;
486+ }
487+
488+ /* XXX We don't have a good way to return specific errors from ebl calls.
489+ This value means we do not understand the type, but it is well-formed
490+ DWARF and might be valid. */
491+ return -2;
492+}
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch b/meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch
deleted file mode 100644
index 62999985cc..0000000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1From 3daec2dd11a04955f95e8f65a48820103d84dbec Mon Sep 17 00:00:00 2001
2From: Junling Zheng <zhengjunling@huawei.com>
3Date: Thu, 9 Apr 2015 12:12:49 +0000
4Subject: [PATCH] uclibc support for elfutils 0.161
5
6on uclibc systems libintl and libuargp are separate from libc.
7so they need to be specified on commandline when we use proxy-libintl
8then libintl is a static archive so it should be listed last since
9elfutils does not respect disable-nls we need to link in libintl
10
11We add a new option --enable-uclibc which will be used to control
12the uclibc specific configurations during build.
13
14Upstream-Status: Inappropriate [uclibc specific]
15
16Signed-off-by: Khem Raj <raj.khem>
17Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
18[Junling Zheng:
19 - adjust context
20]
21---
22 configure.ac | 8 ++++++++
23 libcpu/Makefile.am | 4 ++++
24 libdw/Makefile.am | 7 ++++++-
25 libelf/Makefile.am | 5 +++++
26 4 files changed, 23 insertions(+), 1 deletion(-)
27
28Index: elfutils-0.166/configure.ac
29===================================================================
30--- elfutils-0.166.orig/configure.ac
31+++ elfutils-0.166/configure.ac
32@@ -79,6 +79,14 @@ AS_IF([test "$use_locks" = yes],
33
34 AH_TEMPLATE([USE_LOCKS], [Defined if libraries should be thread-safe.])
35
36+AC_ARG_ENABLE([uclibc],
37+AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]),
38+use_uclibc=yes, use_uclibc=no)
39+AM_CONDITIONAL(USE_UCLIBC, test "$use_uclibc" = yes)
40+AS_IF([test "$use_uclibc" = yes], [AC_DEFINE(USE_UCLIBC)])
41+
42+AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.])
43+
44 AC_PROG_CC
45 AC_PROG_RANLIB
46 AC_PROG_YACC
47@@ -347,18 +355,13 @@ AC_LINK_IFELSE(
48 )
49
50 dnl If our libc doesn't provide argp, then test for libargp
51-if test "$libc_has_argp" = "false" ; then
52- AC_MSG_WARN("libc does not have argp")
53- AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
54-
55- if test "$have_argp" = "false"; then
56- AC_MSG_ERROR("no libargp found")
57- else
58- argp_LDADD="-largp"
59- fi
60-else
61- argp_LDADD=""
62-fi
63+AS_IF([test "x$libc_has_argp" = "xfalse"],
64+ [AC_MSG_WARN("libc does not have argp")
65+ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true" argp_LDADD="-largp"], [have_argp="false"])], [argp_LDADD=""])
66+
67+AS_IF([test "x$libc_has_argp" = "xfalse" -a "x$have_argp" = "xfalse"],
68+ AC_CHECK_LIB([uargp], [argp_parse], [have_uargp="true" argp_LDADD="-luargp"], [have_uargp="false"])], [argp_LDADD=""])
69+
70 AC_SUBST([argp_LDADD])
71
72 dnl The directories with content.
73Index: elfutils-0.166/libcpu/Makefile.am
74===================================================================
75--- elfutils-0.166.orig/libcpu/Makefile.am
76+++ elfutils-0.166/libcpu/Makefile.am
77@@ -80,6 +80,10 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i3
78 i386_lex.o: i386_parse.h
79 i386_gendis_LDADD = $(libeu) -lm
80
81+if USE_UCLIBC
82+i386_gendis_LDADD += -lintl
83+endif
84+
85 i386_parse.h: i386_parse.c ;
86
87 EXTRA_DIST = defs/i386
88Index: elfutils-0.166/libdw/Makefile.am
89===================================================================
90--- elfutils-0.166.orig/libdw/Makefile.am
91+++ elfutils-0.166/libdw/Makefile.am
92@@ -102,6 +102,11 @@ endif
93 libdw_pic_a_SOURCES =
94 am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
95
96+libdw_so_LDLIBS =
97+if USE_UCLIBC
98+libdw_so_LDLIBS += -lintl
99+endif
100+
101 libdw_so_SOURCES =
102 libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
103 ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
104@@ -112,7 +117,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
105 -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
106 -Wl,--version-script,$<,--no-undefined \
107 -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
108- -ldl -lz $(argp_LDADD) $(zip_LIBS)
109+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(libdw_so_LDLIBS)
110 @$(textrel_check)
111 $(AM_V_at)ln -fs $@ $@.$(VERSION)
112
113Index: elfutils-0.166/libelf/Makefile.am
114===================================================================
115--- elfutils-0.166.orig/libelf/Makefile.am
116+++ elfutils-0.166/libelf/Makefile.am
117@@ -96,6 +96,11 @@ libelf_pic_a_SOURCES =
118 am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
119
120 libelf_so_LDLIBS = -lz
121+
122+if USE_UCLIBC
123+libelf_so_LDLIBS += -lintl
124+endif
125+
126 if USE_LOCKS
127 libelf_so_LDLIBS += -lpthread
128 endif
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
new file mode 100644
index 0000000000..020ffa141b
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
@@ -0,0 +1,1051 @@
1From 054fedda5ab9b84160d40d90cb967f2f5822b889 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 06:35:34 +0000
4Subject: [PATCH] build: Provide alternatives for glibc assumptions helps
5 compiling it on musl
6
7Upstream-Status: Pending
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Rebase to 0.68
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 Makefile.am | 2 +-
14 lib/color.c | 3 ++-
15 lib/crc32_file.c | 1 +
16 lib/fixedsizehash.h | 1 -
17 lib/system.h | 10 ++++++++++
18 lib/xmalloc.c | 2 +-
19 libasm/asm_end.c | 2 +-
20 libasm/asm_newscn.c | 2 +-
21 libcpu/i386_gendis.c | 2 +-
22 libcpu/i386_lex.c | 2 +-
23 libcpu/i386_parse.c | 2 +-
24 libdw/Makefile.am | 4 +++-
25 libdw/libdw_alloc.c | 2 +-
26 libdwfl/dwfl_build_id_find_elf.c | 3 ++-
27 libdwfl/dwfl_error.c | 4 +++-
28 libdwfl/dwfl_module_getdwarf.c | 1 +
29 libdwfl/find-debuginfo.c | 2 +-
30 libdwfl/libdwfl_crc32_file.c | 10 ++++++++++
31 libdwfl/linux-kernel-modules.c | 1 +
32 libebl/eblopenbackend.c | 2 +-
33 libelf/elf.h | 8 ++++++--
34 libelf/libelf.h | 1 +
35 libelf/libelfP.h | 1 +
36 src/addr2line.c | 2 +-
37 src/ar.c | 2 +-
38 src/arlib.c | 2 +-
39 src/arlib2.c | 2 +-
40 src/elfcmp.c | 2 +-
41 src/elflint.c | 2 +-
42 src/findtextrel.c | 2 +-
43 src/nm.c | 2 +-
44 src/objdump.c | 2 +-
45 src/ranlib.c | 2 +-
46 src/readelf.c | 2 +-
47 src/size.c | 2 +-
48 src/stack.c | 2 +-
49 src/strings.c | 2 +-
50 src/strip.c | 2 +-
51 src/unstrip.c | 2 +-
52 tests/addrscopes.c | 2 +-
53 tests/allregs.c | 2 +-
54 tests/backtrace-data.c | 2 +-
55 tests/backtrace-dwarf.c | 2 +-
56 tests/backtrace.c | 2 +-
57 tests/buildid.c | 2 +-
58 tests/debugaltlink.c | 2 +-
59 tests/debuglink.c | 2 +-
60 tests/deleted.c | 2 +-
61 tests/dwfl-addr-sect.c | 2 +-
62 tests/dwfl-bug-addr-overflow.c | 2 +-
63 tests/dwfl-bug-fd-leak.c | 2 +-
64 tests/dwfl-bug-getmodules.c | 2 +-
65 tests/dwfl-report-elf-align.c | 2 +-
66 tests/dwfllines.c | 2 +-
67 tests/dwflmodtest.c | 2 +-
68 tests/dwflsyms.c | 2 +-
69 tests/early-offscn.c | 2 +-
70 tests/ecp.c | 2 +-
71 tests/find-prologues.c | 2 +-
72 tests/funcretval.c | 2 +-
73 tests/funcscopes.c | 2 +-
74 tests/getsrc_die.c | 2 +-
75 tests/line2addr.c | 2 +-
76 tests/low_high_pc.c | 2 +-
77 tests/md5-sha1-test.c | 2 +-
78 tests/rdwrmmap.c | 2 +-
79 tests/saridx.c | 2 +-
80 tests/sectiondump.c | 2 +-
81 tests/varlocs.c | 2 +-
82 tests/vdsosyms.c | 2 +-
83 70 files changed, 98 insertions(+), 64 deletions(-)
84
85diff --git a/Makefile.am b/Makefile.am
86index 2ff444e..41f77df 100644
87--- a/Makefile.am
88+++ b/Makefile.am
89@@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h
90
91 # Add doc back when we have some real content.
92 SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
93- backends src po tests
94+ backends po tests
95
96 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
97 COPYING COPYING-GPLV2 COPYING-LGPLV3
98diff --git a/lib/color.c b/lib/color.c
99index fde2d9d..73292ac 100644
100--- a/lib/color.c
101+++ b/lib/color.c
102@@ -32,12 +32,13 @@
103 #endif
104
105 #include <argp.h>
106-#include <error.h>
107+#include <err.h>
108 #include <libintl.h>
109 #include <stdlib.h>
110 #include <string.h>
111 #include <unistd.h>
112 #include "libeu.h"
113+#include "system.h"
114
115
116 /* Prototype for option handler. */
117diff --git a/lib/crc32_file.c b/lib/crc32_file.c
118index a8434d4..57e4298 100644
119--- a/lib/crc32_file.c
120+++ b/lib/crc32_file.c
121@@ -35,6 +35,7 @@
122 #include <unistd.h>
123 #include <sys/stat.h>
124 #include <sys/mman.h>
125+#include "system.h"
126
127 int
128 crc32_file (int fd, uint32_t *resp)
129diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
130index dac2a5f..43016fc 100644
131--- a/lib/fixedsizehash.h
132+++ b/lib/fixedsizehash.h
133@@ -30,7 +30,6 @@
134 #include <errno.h>
135 #include <stdlib.h>
136 #include <string.h>
137-#include <sys/cdefs.h>
138
139 #include <system.h>
140
141diff --git a/lib/system.h b/lib/system.h
142index ccd99d6..0e93e60 100644
143--- a/lib/system.h
144+++ b/lib/system.h
145@@ -55,6 +55,16 @@
146 #else
147 # error "Unknown byte order"
148 #endif
149+#ifndef TEMP_FAILURE_RETRY
150+#define TEMP_FAILURE_RETRY(expression) \
151+ (__extension__ \
152+ ({ long int __result; \
153+ do __result = (long int) (expression); \
154+ while (__result == -1L && errno == EINTR); \
155+ __result; }))
156+#endif
157+
158+#define error(status, errno, ...) err(status, __VA_ARGS__)
159
160 #ifndef MAX
161 #define MAX(m, n) ((m) < (n) ? (n) : (m))
162diff --git a/lib/xmalloc.c b/lib/xmalloc.c
163index 0cde384..217b054 100644
164--- a/lib/xmalloc.c
165+++ b/lib/xmalloc.c
166@@ -30,7 +30,7 @@
167 # include <config.h>
168 #endif
169
170-#include <error.h>
171+#include <err.h>
172 #include <libintl.h>
173 #include <stddef.h>
174 #include <stdlib.h>
175diff --git a/libasm/asm_end.c b/libasm/asm_end.c
176index 191a535..bf5ab06 100644
177--- a/libasm/asm_end.c
178+++ b/libasm/asm_end.c
179@@ -32,7 +32,7 @@
180 #endif
181
182 #include <assert.h>
183-#include <error.h>
184+#include <err.h>
185 #include <libintl.h>
186 #include <stdio.h>
187 #include <stdlib.h>
188diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c
189index ddbb25d..74a598d 100644
190--- a/libasm/asm_newscn.c
191+++ b/libasm/asm_newscn.c
192@@ -32,7 +32,7 @@
193 #endif
194
195 #include <assert.h>
196-#include <error.h>
197+#include <err.h>
198 #include <libintl.h>
199 #include <stdlib.h>
200 #include <string.h>
201diff --git a/libcpu/i386_gendis.c b/libcpu/i386_gendis.c
202index aae5eae..6d76016 100644
203--- a/libcpu/i386_gendis.c
204+++ b/libcpu/i386_gendis.c
205@@ -31,7 +31,7 @@
206 # include <config.h>
207 #endif
208
209-#include <error.h>
210+#include <err.h>
211 #include <errno.h>
212 #include <stdio.h>
213 #include <stdlib.h>
214diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c
215index b670608..b842c25 100644
216--- a/libcpu/i386_lex.c
217+++ b/libcpu/i386_lex.c
218@@ -592,7 +592,7 @@ char *i386_text;
219 #endif
220
221 #include <ctype.h>
222-#include <error.h>
223+#include <err.h>
224 #include <libintl.h>
225
226 #include <libeu.h>
227diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c
228index 724addf..5b67802 100644
229--- a/libcpu/i386_parse.c
230+++ b/libcpu/i386_parse.c
231@@ -107,7 +107,7 @@
232 #include <assert.h>
233 #include <ctype.h>
234 #include <errno.h>
235-#include <error.h>
236+#include <err.h>
237 #include <inttypes.h>
238 #include <libintl.h>
239 #include <math.h>
240diff --git a/libdw/Makefile.am b/libdw/Makefile.am
241index 082d96c..51cbea0 100644
242--- a/libdw/Makefile.am
243+++ b/libdw/Makefile.am
244@@ -102,6 +102,8 @@ endif
245 libdw_pic_a_SOURCES =
246 am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
247
248+fts_LDADD = -lfts
249+
250 libdw_so_SOURCES =
251 libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
252 ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
253@@ -112,7 +114,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
254 -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
255 -Wl,--version-script,$<,--no-undefined \
256 -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
257- -ldl -lz $(argp_LDADD) $(zip_LIBS)
258+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(fts_LDADD)
259 @$(textrel_check)
260 $(AM_V_at)ln -fs $@ $@.$(VERSION)
261
262diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c
263index 28a8cf6..29aeb3f 100644
264--- a/libdw/libdw_alloc.c
265+++ b/libdw/libdw_alloc.c
266@@ -31,7 +31,7 @@
267 # include <config.h>
268 #endif
269
270-#include <error.h>
271+#include <err.h>
272 #include <errno.h>
273 #include <stdlib.h>
274 #include "libdwP.h"
275diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
276index 903e193..b00d10c 100644
277--- a/libdwfl/dwfl_build_id_find_elf.c
278+++ b/libdwfl/dwfl_build_id_find_elf.c
279@@ -27,6 +27,7 @@
280 not, see <http://www.gnu.org/licenses/>. */
281
282 #include "libdwflP.h"
283+#include "system.h"
284 #include <inttypes.h>
285 #include <fcntl.h>
286 #include <unistd.h>
287@@ -94,7 +95,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name,
288 {
289 if (*file_name != NULL)
290 free (*file_name);
291- *file_name = canonicalize_file_name (name);
292+ *file_name = realpath (name, NULL);
293 if (*file_name == NULL)
294 {
295 *file_name = name;
296diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
297index 7bcf61c..c345797 100644
298--- a/libdwfl/dwfl_error.c
299+++ b/libdwfl/dwfl_error.c
300@@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error)
301 const char *
302 dwfl_errmsg (int error)
303 {
304+ static __thread char s[64] = "";
305 if (error == 0 || error == -1)
306 {
307 int last_error = global_error;
308@@ -154,7 +155,8 @@ dwfl_errmsg (int error)
309 switch (error &~ 0xffff)
310 {
311 case OTHER_ERROR (ERRNO):
312- return strerror_r (error & 0xffff, "bad", 0);
313+ strerror_r (error & 0xffff, s, sizeof(s));
314+ return s;
315 case OTHER_ERROR (LIBELF):
316 return elf_errmsg (error & 0xffff);
317 case OTHER_ERROR (LIBDW):
318diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
319index 0e8810b..82ad665 100644
320--- a/libdwfl/dwfl_module_getdwarf.c
321+++ b/libdwfl/dwfl_module_getdwarf.c
322@@ -31,6 +31,7 @@
323 #include <fcntl.h>
324 #include <string.h>
325 #include <unistd.h>
326+#include "system.h"
327 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
328 #include "../libelf/libelfP.h"
329
330diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
331index 80515db..80b0148 100644
332--- a/libdwfl/find-debuginfo.c
333+++ b/libdwfl/find-debuginfo.c
334@@ -385,7 +385,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod,
335 /* If FILE_NAME is a symlink, the debug file might be associated
336 with the symlink target name instead. */
337
338- char *canon = canonicalize_file_name (file_name);
339+ char *canon = realpath (file_name, NULL);
340 if (canon != NULL && strcmp (file_name, canon))
341 fd = find_debuginfo_in_path (mod, canon,
342 debuglink_file, debuglink_crc,
343diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
344index 6b6b7d3..debc4a4 100644
345--- a/libdwfl/libdwfl_crc32_file.c
346+++ b/libdwfl/libdwfl_crc32_file.c
347@@ -31,6 +31,16 @@
348
349 #define crc32_file attribute_hidden __libdwfl_crc32_file
350 #define crc32 __libdwfl_crc32
351+
352+#ifndef TEMP_FAILURE_RETRY
353+#define TEMP_FAILURE_RETRY(expression) \
354+ (__extension__ \
355+ ({ long int __result; \
356+ do __result = (long int) (expression); \
357+ while (__result == -1L && errno == EINTR); \
358+ __result; }))
359+#endif
360+
361 #define LIB_SYSTEM_H 1
362 #include <libdwflP.h>
363 #include "../lib/crc32_file.c"
364diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
365index 9cd8ea9..4dbf4c5 100644
366--- a/libdwfl/linux-kernel-modules.c
367+++ b/libdwfl/linux-kernel-modules.c
368@@ -36,6 +36,7 @@
369 #include <config.h>
370
371 #include "libdwflP.h"
372+#include "system.h"
373 #include <inttypes.h>
374 #include <errno.h>
375 #include <stdio.h>
376diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
377index 34d439a..56d2345 100644
378--- a/libebl/eblopenbackend.c
379+++ b/libebl/eblopenbackend.c
380@@ -32,7 +32,7 @@
381
382 #include <assert.h>
383 #include <dlfcn.h>
384-#include <error.h>
385+#include <err.h>
386 #include <libelfP.h>
387 #include <dwarf.h>
388 #include <stdlib.h>
389diff --git a/libelf/elf.h b/libelf/elf.h
390index 74654d6..81eee8b 100644
391--- a/libelf/elf.h
392+++ b/libelf/elf.h
393@@ -21,7 +21,9 @@
394
395 #include <features.h>
396
397-__BEGIN_DECLS
398+#ifdef __cplusplus
399+extern "C" {
400+#endif
401
402 /* Standard ELF types. */
403
404@@ -3704,6 +3706,8 @@ enum
405 #define R_BPF_NONE 0 /* No reloc */
406 #define R_BPF_MAP_FD 1 /* Map fd to pointer */
407
408-__END_DECLS
409+#ifdef __cplusplus
410+}
411+#endif
412
413 #endif /* elf.h */
414diff --git a/libelf/libelf.h b/libelf/libelf.h
415index c0d6389..38a68fd 100644
416--- a/libelf/libelf.h
417+++ b/libelf/libelf.h
418@@ -29,6 +29,7 @@
419 #ifndef _LIBELF_H
420 #define _LIBELF_H 1
421
422+#include <fcntl.h>
423 #include <stdint.h>
424 #include <sys/types.h>
425
426diff --git a/libelf/libelfP.h b/libelf/libelfP.h
427index 4459982..1296f20 100644
428--- a/libelf/libelfP.h
429+++ b/libelf/libelfP.h
430@@ -36,6 +36,7 @@
431
432 #include <ar.h>
433 #include <gelf.h>
434+#include <libelf.h>
435
436 #include <errno.h>
437 #include <stdbool.h>
438diff --git a/src/addr2line.c b/src/addr2line.c
439index 0222088..cd6a9a6 100644
440--- a/src/addr2line.c
441+++ b/src/addr2line.c
442@@ -23,7 +23,7 @@
443 #include <argp.h>
444 #include <assert.h>
445 #include <errno.h>
446-#include <error.h>
447+#include <err.h>
448 #include <fcntl.h>
449 #include <inttypes.h>
450 #include <libdwfl.h>
451diff --git a/src/ar.c b/src/ar.c
452index f2f322b..6e70031 100644
453--- a/src/ar.c
454+++ b/src/ar.c
455@@ -22,7 +22,7 @@
456
457 #include <argp.h>
458 #include <assert.h>
459-#include <error.h>
460+#include <err.h>
461 #include <fcntl.h>
462 #include <gelf.h>
463 #include <libintl.h>
464diff --git a/src/arlib.c b/src/arlib.c
465index e0839aa..1143658 100644
466--- a/src/arlib.c
467+++ b/src/arlib.c
468@@ -21,7 +21,7 @@
469 #endif
470
471 #include <assert.h>
472-#include <error.h>
473+#include <err.h>
474 #include <gelf.h>
475 #include <inttypes.h>
476 #include <libintl.h>
477diff --git a/src/arlib2.c b/src/arlib2.c
478index 553fc57..46443d0 100644
479--- a/src/arlib2.c
480+++ b/src/arlib2.c
481@@ -20,7 +20,7 @@
482 # include <config.h>
483 #endif
484
485-#include <error.h>
486+#include <err.h>
487 #include <libintl.h>
488 #include <limits.h>
489 #include <string.h>
490diff --git a/src/elfcmp.c b/src/elfcmp.c
491index 401ab31..873d253 100644
492--- a/src/elfcmp.c
493+++ b/src/elfcmp.c
494@@ -23,7 +23,7 @@
495 #include <argp.h>
496 #include <assert.h>
497 #include <errno.h>
498-#include <error.h>
499+#include <err.h>
500 #include <fcntl.h>
501 #include <locale.h>
502 #include <libintl.h>
503diff --git a/src/elflint.c b/src/elflint.c
504index 7d3f227..074d21c 100644
505--- a/src/elflint.c
506+++ b/src/elflint.c
507@@ -24,7 +24,7 @@
508 #include <assert.h>
509 #include <byteswap.h>
510 #include <endian.h>
511-#include <error.h>
512+#include <err.h>
513 #include <fcntl.h>
514 #include <gelf.h>
515 #include <inttypes.h>
516diff --git a/src/findtextrel.c b/src/findtextrel.c
517index dc41502..325888c 100644
518--- a/src/findtextrel.c
519+++ b/src/findtextrel.c
520@@ -23,7 +23,7 @@
521 #include <argp.h>
522 #include <assert.h>
523 #include <errno.h>
524-#include <error.h>
525+#include <err.h>
526 #include <fcntl.h>
527 #include <gelf.h>
528 #include <libdw.h>
529diff --git a/src/nm.c b/src/nm.c
530index c54e96f..9e031d9 100644
531--- a/src/nm.c
532+++ b/src/nm.c
533@@ -26,7 +26,7 @@
534 #include <ctype.h>
535 #include <dwarf.h>
536 #include <errno.h>
537-#include <error.h>
538+#include <err.h>
539 #include <fcntl.h>
540 #include <gelf.h>
541 #include <inttypes.h>
542diff --git a/src/objdump.c b/src/objdump.c
543index fff4b81..4b1f966 100644
544--- a/src/objdump.c
545+++ b/src/objdump.c
546@@ -21,7 +21,7 @@
547 #endif
548
549 #include <argp.h>
550-#include <error.h>
551+#include <err.h>
552 #include <fcntl.h>
553 #include <inttypes.h>
554 #include <libintl.h>
555diff --git a/src/ranlib.c b/src/ranlib.c
556index 41a3bcf..0c7da2c 100644
557--- a/src/ranlib.c
558+++ b/src/ranlib.c
559@@ -24,7 +24,7 @@
560 #include <argp.h>
561 #include <assert.h>
562 #include <errno.h>
563-#include <error.h>
564+#include <err.h>
565 #include <fcntl.h>
566 #include <gelf.h>
567 #include <libintl.h>
568diff --git a/src/readelf.c b/src/readelf.c
569index d18a4b7..a6cfb35 100644
570--- a/src/readelf.c
571+++ b/src/readelf.c
572@@ -25,7 +25,7 @@
573 #include <ctype.h>
574 #include <dwarf.h>
575 #include <errno.h>
576-#include <error.h>
577+#include <err.h>
578 #include <fcntl.h>
579 #include <gelf.h>
580 #include <inttypes.h>
581diff --git a/src/size.c b/src/size.c
582index de0d791..4639d42 100644
583--- a/src/size.c
584+++ b/src/size.c
585@@ -21,7 +21,7 @@
586 #endif
587
588 #include <argp.h>
589-#include <error.h>
590+#include <err.h>
591 #include <fcntl.h>
592 #include <gelf.h>
593 #include <inttypes.h>
594diff --git a/src/stack.c b/src/stack.c
595index a5a7beb..4c075bc 100644
596--- a/src/stack.c
597+++ b/src/stack.c
598@@ -18,7 +18,7 @@
599 #include <config.h>
600 #include <assert.h>
601 #include <argp.h>
602-#include <error.h>
603+#include <err.h>
604 #include <stdlib.h>
605 #include <inttypes.h>
606 #include <stdio.h>
607diff --git a/src/strings.c b/src/strings.c
608index 49aab8b..09d5b1c 100644
609--- a/src/strings.c
610+++ b/src/strings.c
611@@ -25,7 +25,7 @@
612 #include <ctype.h>
613 #include <endian.h>
614 #include <errno.h>
615-#include <error.h>
616+#include <err.h>
617 #include <fcntl.h>
618 #include <gelf.h>
619 #include <inttypes.h>
620diff --git a/src/strip.c b/src/strip.c
621index a875ddf..fd76f7f 100644
622--- a/src/strip.c
623+++ b/src/strip.c
624@@ -24,7 +24,7 @@
625 #include <assert.h>
626 #include <byteswap.h>
627 #include <endian.h>
628-#include <error.h>
629+#include <err.h>
630 #include <fcntl.h>
631 #include <gelf.h>
632 #include <libelf.h>
633diff --git a/src/unstrip.c b/src/unstrip.c
634index d838ae9..0108272 100644
635--- a/src/unstrip.c
636+++ b/src/unstrip.c
637@@ -31,7 +31,7 @@
638 #include <argp.h>
639 #include <assert.h>
640 #include <errno.h>
641-#include <error.h>
642+#include <err.h>
643 #include <fcntl.h>
644 #include <fnmatch.h>
645 #include <libintl.h>
646diff --git a/tests/addrscopes.c b/tests/addrscopes.c
647index 791569f..54f4311 100644
648--- a/tests/addrscopes.c
649+++ b/tests/addrscopes.c
650@@ -25,7 +25,7 @@
651 #include <stdio_ext.h>
652 #include <locale.h>
653 #include <stdlib.h>
654-#include <error.h>
655+#include <err.h>
656 #include <string.h>
657
658
659diff --git a/tests/allregs.c b/tests/allregs.c
660index 286f7e3..c9de089 100644
661--- a/tests/allregs.c
662+++ b/tests/allregs.c
663@@ -21,7 +21,7 @@
664 #include <stdio.h>
665 #include <stdlib.h>
666 #include <string.h>
667-#include <error.h>
668+#include <err.h>
669 #include <locale.h>
670 #include <argp.h>
671 #include <assert.h>
672diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c
673index b7158da..354fa6a 100644
674--- a/tests/backtrace-data.c
675+++ b/tests/backtrace-data.c
676@@ -27,7 +27,7 @@
677 #include <dirent.h>
678 #include <stdlib.h>
679 #include <errno.h>
680-#include <error.h>
681+#include <err.h>
682 #include <unistd.h>
683 #include <dwarf.h>
684 #if defined(__x86_64__) && defined(__linux__)
685diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c
686index a644c8a..b8cbe27 100644
687--- a/tests/backtrace-dwarf.c
688+++ b/tests/backtrace-dwarf.c
689@@ -22,7 +22,7 @@
690 #include <stdio_ext.h>
691 #include <locale.h>
692 #include <errno.h>
693-#include <error.h>
694+#include <err.h>
695 #include <unistd.h>
696 #include <sys/ptrace.h>
697 #include <sys/types.h>
698diff --git a/tests/backtrace.c b/tests/backtrace.c
699index 1ff6353..47e3f7b 100644
700--- a/tests/backtrace.c
701+++ b/tests/backtrace.c
702@@ -24,7 +24,7 @@
703 #include <dirent.h>
704 #include <stdlib.h>
705 #include <errno.h>
706-#include <error.h>
707+#include <err.h>
708 #include <unistd.h>
709 #include <dwarf.h>
710 #ifdef __linux__
711diff --git a/tests/buildid.c b/tests/buildid.c
712index 87c1877..2953e6b 100644
713--- a/tests/buildid.c
714+++ b/tests/buildid.c
715@@ -23,7 +23,7 @@
716 #include ELFUTILS_HEADER(elf)
717 #include ELFUTILS_HEADER(dwelf)
718 #include <stdio.h>
719-#include <error.h>
720+#include <err.h>
721 #include <string.h>
722 #include <stdlib.h>
723 #include <sys/types.h>
724diff --git a/tests/debugaltlink.c b/tests/debugaltlink.c
725index 6d97d50..ee7e559 100644
726--- a/tests/debugaltlink.c
727+++ b/tests/debugaltlink.c
728@@ -23,7 +23,7 @@
729 #include ELFUTILS_HEADER(dw)
730 #include ELFUTILS_HEADER(dwelf)
731 #include <stdio.h>
732-#include <error.h>
733+#include <err.h>
734 #include <string.h>
735 #include <stdlib.h>
736 #include <sys/types.h>
737diff --git a/tests/debuglink.c b/tests/debuglink.c
738index 935d102..741cb81 100644
739--- a/tests/debuglink.c
740+++ b/tests/debuglink.c
741@@ -21,7 +21,7 @@
742 #include <errno.h>
743 #include ELFUTILS_HEADER(dwelf)
744 #include <stdio.h>
745-#include <error.h>
746+#include <err.h>
747 #include <string.h>
748 #include <stdlib.h>
749 #include <sys/types.h>
750diff --git a/tests/deleted.c b/tests/deleted.c
751index 6be35bc..0190711 100644
752--- a/tests/deleted.c
753+++ b/tests/deleted.c
754@@ -21,7 +21,7 @@
755 #include <unistd.h>
756 #include <assert.h>
757 #include <stdio.h>
758-#include <error.h>
759+#include <err.h>
760 #include <errno.h>
761 #ifdef __linux__
762 #include <sys/prctl.h>
763diff --git a/tests/dwfl-addr-sect.c b/tests/dwfl-addr-sect.c
764index 21e470a..1ea1e3b 100644
765--- a/tests/dwfl-addr-sect.c
766+++ b/tests/dwfl-addr-sect.c
767@@ -23,7 +23,7 @@
768 #include <stdio_ext.h>
769 #include <stdlib.h>
770 #include <string.h>
771-#include <error.h>
772+#include <err.h>
773 #include <locale.h>
774 #include <argp.h>
775 #include ELFUTILS_HEADER(dwfl)
776diff --git a/tests/dwfl-bug-addr-overflow.c b/tests/dwfl-bug-addr-overflow.c
777index aa8030e..02c8bef 100644
778--- a/tests/dwfl-bug-addr-overflow.c
779+++ b/tests/dwfl-bug-addr-overflow.c
780@@ -20,7 +20,7 @@
781 #include <inttypes.h>
782 #include <stdio.h>
783 #include <stdio_ext.h>
784-#include <error.h>
785+#include <err.h>
786 #include <locale.h>
787 #include ELFUTILS_HEADER(dwfl)
788
789diff --git a/tests/dwfl-bug-fd-leak.c b/tests/dwfl-bug-fd-leak.c
790index 689cdd7..5973da3 100644
791--- a/tests/dwfl-bug-fd-leak.c
792+++ b/tests/dwfl-bug-fd-leak.c
793@@ -24,7 +24,7 @@
794 #include <dirent.h>
795 #include <stdlib.h>
796 #include <errno.h>
797-#include <error.h>
798+#include <err.h>
799 #include <unistd.h>
800 #include <dwarf.h>
801
802diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c
803index 1ee989f..fd62e65 100644
804--- a/tests/dwfl-bug-getmodules.c
805+++ b/tests/dwfl-bug-getmodules.c
806@@ -18,7 +18,7 @@
807 #include <config.h>
808 #include ELFUTILS_HEADER(dwfl)
809
810-#include <error.h>
811+#include <err.h>
812
813 static const Dwfl_Callbacks callbacks =
814 {
815diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c
816index a4e97d3..f471587 100644
817--- a/tests/dwfl-report-elf-align.c
818+++ b/tests/dwfl-report-elf-align.c
819@@ -20,7 +20,7 @@
820 #include <inttypes.h>
821 #include <stdio.h>
822 #include <stdio_ext.h>
823-#include <error.h>
824+#include <err.h>
825 #include <locale.h>
826 #include <string.h>
827 #include <stdlib.h>
828diff --git a/tests/dwfllines.c b/tests/dwfllines.c
829index 90379dd..cbdf6c4 100644
830--- a/tests/dwfllines.c
831+++ b/tests/dwfllines.c
832@@ -27,7 +27,7 @@
833 #include <stdio.h>
834 #include <stdlib.h>
835 #include <string.h>
836-#include <error.h>
837+#include <err.h>
838
839 int
840 main (int argc, char *argv[])
841diff --git a/tests/dwflmodtest.c b/tests/dwflmodtest.c
842index 0027f96..e68d3bc 100644
843--- a/tests/dwflmodtest.c
844+++ b/tests/dwflmodtest.c
845@@ -23,7 +23,7 @@
846 #include <stdio_ext.h>
847 #include <stdlib.h>
848 #include <string.h>
849-#include <error.h>
850+#include <err.h>
851 #include <locale.h>
852 #include <argp.h>
853 #include ELFUTILS_HEADER(dwfl)
854diff --git a/tests/dwflsyms.c b/tests/dwflsyms.c
855index 49ac334..cf07830 100644
856--- a/tests/dwflsyms.c
857+++ b/tests/dwflsyms.c
858@@ -25,7 +25,7 @@
859 #include <stdio.h>
860 #include <stdio_ext.h>
861 #include <stdlib.h>
862-#include <error.h>
863+#include <err.h>
864 #include <string.h>
865
866 static const char *
867diff --git a/tests/early-offscn.c b/tests/early-offscn.c
868index 924cb9e..6f60d5a 100644
869--- a/tests/early-offscn.c
870+++ b/tests/early-offscn.c
871@@ -19,7 +19,7 @@
872 #endif
873
874 #include <errno.h>
875-#include <error.h>
876+#include <err.h>
877 #include <fcntl.h>
878 #include <gelf.h>
879 #include <stdio.h>
880diff --git a/tests/ecp.c b/tests/ecp.c
881index 38a6859..743cea5 100644
882--- a/tests/ecp.c
883+++ b/tests/ecp.c
884@@ -20,7 +20,7 @@
885 #endif
886
887 #include <errno.h>
888-#include <error.h>
889+#include <err.h>
890 #include <fcntl.h>
891 #include <gelf.h>
892 #include <stdlib.h>
893diff --git a/tests/find-prologues.c b/tests/find-prologues.c
894index ba8ae37..76f5f04 100644
895--- a/tests/find-prologues.c
896+++ b/tests/find-prologues.c
897@@ -25,7 +25,7 @@
898 #include <stdio_ext.h>
899 #include <locale.h>
900 #include <stdlib.h>
901-#include <error.h>
902+#include <err.h>
903 #include <string.h>
904 #include <fnmatch.h>
905
906diff --git a/tests/funcretval.c b/tests/funcretval.c
907index 8d19d11..c8aaa93 100644
908--- a/tests/funcretval.c
909+++ b/tests/funcretval.c
910@@ -25,7 +25,7 @@
911 #include <stdio_ext.h>
912 #include <locale.h>
913 #include <stdlib.h>
914-#include <error.h>
915+#include <err.h>
916 #include <string.h>
917 #include <fnmatch.h>
918
919diff --git a/tests/funcscopes.c b/tests/funcscopes.c
920index 9c90185..dbccb89 100644
921--- a/tests/funcscopes.c
922+++ b/tests/funcscopes.c
923@@ -25,7 +25,7 @@
924 #include <stdio_ext.h>
925 #include <locale.h>
926 #include <stdlib.h>
927-#include <error.h>
928+#include <err.h>
929 #include <string.h>
930 #include <fnmatch.h>
931
932diff --git a/tests/getsrc_die.c b/tests/getsrc_die.c
933index 055aede..9c394dd 100644
934--- a/tests/getsrc_die.c
935+++ b/tests/getsrc_die.c
936@@ -19,7 +19,7 @@
937 #endif
938
939 #include <errno.h>
940-#include <error.h>
941+#include <err.h>
942 #include <fcntl.h>
943 #include <inttypes.h>
944 #include <libelf.h>
945diff --git a/tests/line2addr.c b/tests/line2addr.c
946index e0d65d3..9bf0023 100644
947--- a/tests/line2addr.c
948+++ b/tests/line2addr.c
949@@ -26,7 +26,7 @@
950 #include <locale.h>
951 #include <stdlib.h>
952 #include <string.h>
953-#include <error.h>
954+#include <err.h>
955
956
957 static void
958diff --git a/tests/low_high_pc.c b/tests/low_high_pc.c
959index d0f4302..8da4fbd 100644
960--- a/tests/low_high_pc.c
961+++ b/tests/low_high_pc.c
962@@ -25,7 +25,7 @@
963 #include <stdio_ext.h>
964 #include <locale.h>
965 #include <stdlib.h>
966-#include <error.h>
967+#include <err.h>
968 #include <string.h>
969 #include <fnmatch.h>
970
971diff --git a/tests/md5-sha1-test.c b/tests/md5-sha1-test.c
972index d50355e..3c41f40 100644
973--- a/tests/md5-sha1-test.c
974+++ b/tests/md5-sha1-test.c
975@@ -19,7 +19,7 @@
976 #endif
977
978 #include <string.h>
979-#include <error.h>
980+#include <err.h>
981
982 #include "md5.h"
983 #include "sha1.h"
984diff --git a/tests/rdwrmmap.c b/tests/rdwrmmap.c
985index 6f027df..1ce5e6e 100644
986--- a/tests/rdwrmmap.c
987+++ b/tests/rdwrmmap.c
988@@ -19,7 +19,7 @@
989 #endif
990
991 #include <errno.h>
992-#include <error.h>
993+#include <err.h>
994 #include <stdio.h>
995 #include <fcntl.h>
996 #include <unistd.h>
997diff --git a/tests/saridx.c b/tests/saridx.c
998index 8a450d8..b387801 100644
999--- a/tests/saridx.c
1000+++ b/tests/saridx.c
1001@@ -17,7 +17,7 @@
1002
1003 #include <config.h>
1004
1005-#include <error.h>
1006+#include <err.h>
1007 #include <fcntl.h>
1008 #include <gelf.h>
1009 #include <stdio.h>
1010diff --git a/tests/sectiondump.c b/tests/sectiondump.c
1011index 3033fed..8e888db 100644
1012--- a/tests/sectiondump.c
1013+++ b/tests/sectiondump.c
1014@@ -18,7 +18,7 @@
1015 #include <config.h>
1016
1017 #include <errno.h>
1018-#include <error.h>
1019+#include <err.h>
1020 #include <fcntl.h>
1021 #include <gelf.h>
1022 #include <inttypes.h>
1023diff --git a/tests/varlocs.c b/tests/varlocs.c
1024index c3fba89..e043ea2 100644
1025--- a/tests/varlocs.c
1026+++ b/tests/varlocs.c
1027@@ -25,7 +25,7 @@
1028 #include <dwarf.h>
1029 #include <stdio.h>
1030 #include <stdlib.h>
1031-#include <error.h>
1032+#include <err.h>
1033 #include <string.h>
1034 #include <sys/types.h>
1035 #include <sys/stat.h>
1036diff --git a/tests/vdsosyms.c b/tests/vdsosyms.c
1037index b876c10..afb2823 100644
1038--- a/tests/vdsosyms.c
1039+++ b/tests/vdsosyms.c
1040@@ -18,7 +18,7 @@
1041 #include <config.h>
1042 #include <assert.h>
1043 #include <errno.h>
1044-#include <error.h>
1045+#include <err.h>
1046 #include <inttypes.h>
1047 #include <stdio.h>
1048 #include <string.h>
1049--
10502.8.1
1051
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
index 3754c1c361..3754c1c361 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-fix-a-stack-usage-warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch
index 6923bf7053..6923bf7053 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-fix-a-stack-usage-warning.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-remove-the-unneed-checking.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch
index 5be92d705a..5be92d705a 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-remove-the-unneed-checking.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/aarch64_uio.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch
index 38dc57befc..38dc57befc 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/aarch64_uio.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-Ignore-differences-between-mips-machine-identifiers.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
index 3f110f98fc..e0291b4cf3 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-Ignore-differences-between-mips-machine-identifiers.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
@@ -8,15 +8,19 @@ from the elf machine id. Also, the EM_MIPS_RS3_LE machine is dead anyway (the
8kernel will not load binaries containing it). 8kernel will not load binaries containing it).
9 9
10Signed-off-by: James Cowgill <james410@cowgill.org.uk> 10Signed-off-by: James Cowgill <james410@cowgill.org.uk>
11
12Upstream-Status: Backport [from debian]
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14
11--- 15---
12 backends/mips_init.c | 6 +----- 16 backends/mips_init.c | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-) 17 1 file changed, 1 insertion(+), 5 deletions(-)
14 18
15diff --git a/backends/mips_init.c b/backends/mips_init.c 19Index: b/backends/mips_init.c
16index 7429a89..d10e940 100644 20===================================================================
17--- a/backends/mips_init.c 21--- a/backends/mips_init.c
18+++ b/backends/mips_init.c 22+++ b/backends/mips_init.c
19@@ -46,11 +46,7 @@ mips_init (elf, machine, eh, ehlen) 23@@ -45,11 +45,7 @@ mips_init (Elf *elf __attribute__ ((unus
20 return NULL; 24 return NULL;
21 25
22 /* We handle it. */ 26 /* We handle it. */
@@ -29,6 +33,3 @@ index 7429a89..d10e940 100644
29 mips_init_reloc (eh); 33 mips_init_reloc (eh);
30 HOOK (eh, reloc_simple_type); 34 HOOK (eh, reloc_simple_type);
31 HOOK (eh, return_value_location); 35 HOOK (eh, return_value_location);
32--
332.1.4
34
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
index 72125c9ff0..b17498f5fa 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
@@ -4,6 +4,9 @@ Date: Mon, 5 Jan 2015 15:17:01 +0000
4Subject: [PATCH 2/3] Add support for mips64 abis in mips_retval.c 4Subject: [PATCH 2/3] Add support for mips64 abis in mips_retval.c
5 5
6Signed-off-by: James Cowgill <james410@cowgill.org.uk> 6Signed-off-by: James Cowgill <james410@cowgill.org.uk>
7
8Upstream-Status: Backport [from debian]
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
7--- 10---
8 backends/mips_retval.c | 104 ++++++++++++++++++++++++++++++++++++++++++++----- 11 backends/mips_retval.c | 104 ++++++++++++++++++++++++++++++++++++++++++++-----
9 1 file changed, 94 insertions(+), 10 deletions(-) 12 1 file changed, 94 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/0003-Add-mips-n64-relocation-format-hack.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0003-Add-mips-n64-relocation-format-hack.patch
index 14b7985ce8..2a5f8628d9 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/0003-Add-mips-n64-relocation-format-hack.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0003-Add-mips-n64-relocation-format-hack.patch
@@ -12,6 +12,9 @@ This patch also ensures that strip.c sets the correct value of e_machine
12before manipulating relocations so that these changes take effect. 12before manipulating relocations so that these changes take effect.
13 13
14Signed-off-by: James Cowgill <james410@cowgill.org.uk> 14Signed-off-by: James Cowgill <james410@cowgill.org.uk>
15
16Upstream-Status: Backport [from debian]
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15--- 18---
16 libelf/gelf_getrel.c | 25 +++++++++++++++++++++++-- 19 libelf/gelf_getrel.c | 25 +++++++++++++++++++++++--
17 libelf/gelf_getrela.c | 25 +++++++++++++++++++++++-- 20 libelf/gelf_getrela.c | 25 +++++++++++++++++++++++--
@@ -20,10 +23,10 @@ Signed-off-by: James Cowgill <james410@cowgill.org.uk>
20 src/strip.c | 17 +++++++++++++++++ 23 src/strip.c | 17 +++++++++++++++++
21 5 files changed, 101 insertions(+), 6 deletions(-) 24 5 files changed, 101 insertions(+), 6 deletions(-)
22 25
23Index: elfutils-0.164/libelf/gelf_getrel.c 26Index: b/libelf/gelf_getrel.c
24=================================================================== 27===================================================================
25--- elfutils-0.164.orig/libelf/gelf_getrel.c 28--- a/libelf/gelf_getrel.c
26+++ elfutils-0.164/libelf/gelf_getrel.c 29+++ b/libelf/gelf_getrel.c
27@@ -36,6 +36,7 @@ 30@@ -36,6 +36,7 @@
28 31
29 #include "libelfP.h" 32 #include "libelfP.h"
@@ -63,10 +66,10 @@ Index: elfutils-0.164/libelf/gelf_getrel.c
63 } 66 }
64 67
65 rwlock_unlock (scn->elf->lock); 68 rwlock_unlock (scn->elf->lock);
66Index: elfutils-0.164/libelf/gelf_getrela.c 69Index: b/libelf/gelf_getrela.c
67=================================================================== 70===================================================================
68--- elfutils-0.164.orig/libelf/gelf_getrela.c 71--- a/libelf/gelf_getrela.c
69+++ elfutils-0.164/libelf/gelf_getrela.c 72+++ b/libelf/gelf_getrela.c
70@@ -36,6 +36,7 @@ 73@@ -36,6 +36,7 @@
71 74
72 #include "libelfP.h" 75 #include "libelfP.h"
@@ -106,10 +109,10 @@ Index: elfutils-0.164/libelf/gelf_getrela.c
106 } 109 }
107 110
108 rwlock_unlock (scn->elf->lock); 111 rwlock_unlock (scn->elf->lock);
109Index: elfutils-0.164/libelf/gelf_update_rel.c 112Index: b/libelf/gelf_update_rel.c
110=================================================================== 113===================================================================
111--- elfutils-0.164.orig/libelf/gelf_update_rel.c 114--- a/libelf/gelf_update_rel.c
112+++ elfutils-0.164/libelf/gelf_update_rel.c 115+++ b/libelf/gelf_update_rel.c
113@@ -36,6 +36,7 @@ 116@@ -36,6 +36,7 @@
114 117
115 #include "libelfP.h" 118 #include "libelfP.h"
@@ -151,10 +154,10 @@ Index: elfutils-0.164/libelf/gelf_update_rel.c
151 } 154 }
152 155
153 result = 1; 156 result = 1;
154Index: elfutils-0.164/libelf/gelf_update_rela.c 157Index: b/libelf/gelf_update_rela.c
155=================================================================== 158===================================================================
156--- elfutils-0.164.orig/libelf/gelf_update_rela.c 159--- a/libelf/gelf_update_rela.c
157+++ elfutils-0.164/libelf/gelf_update_rela.c 160+++ b/libelf/gelf_update_rela.c
158@@ -36,6 +36,7 @@ 161@@ -36,6 +36,7 @@
159 162
160 #include "libelfP.h" 163 #include "libelfP.h"
@@ -196,11 +199,11 @@ Index: elfutils-0.164/libelf/gelf_update_rela.c
196 } 199 }
197 200
198 result = 1; 201 result = 1;
199Index: elfutils-0.164/src/strip.c 202Index: b/src/strip.c
200=================================================================== 203===================================================================
201--- elfutils-0.164.orig/src/strip.c 204--- a/src/strip.c
202+++ elfutils-0.164/src/strip.c 205+++ b/src/strip.c
203@@ -546,6 +546,23 @@ handle_elf (int fd, Elf *elf, const char 206@@ -532,6 +532,23 @@ handle_elf (int fd, Elf *elf, const char
204 goto fail; 207 goto fail;
205 } 208 }
206 209
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/arm_backend.diff
index 9d47f95f26..50f4b059e3 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/arm_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/arm_backend.diff
@@ -1,7 +1,10 @@
1Index: elfutils-0.164/backends/arm_init.c 1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3
4Index: b/backends/arm_init.c
2=================================================================== 5===================================================================
3--- elfutils-0.164.orig/backends/arm_init.c 6--- a/backends/arm_init.c
4+++ elfutils-0.164/backends/arm_init.c 7+++ b/backends/arm_init.c
5@@ -35,20 +35,31 @@ 8@@ -35,20 +35,31 @@
6 #define RELOC_PREFIX R_ARM_ 9 #define RELOC_PREFIX R_ARM_
7 #include "libebl_CPU.h" 10 #include "libebl_CPU.h"
@@ -47,10 +50,10 @@ Index: elfutils-0.164/backends/arm_init.c
47 HOOK (eh, abi_cfi); 50 HOOK (eh, abi_cfi);
48 HOOK (eh, check_reloc_target_type); 51 HOOK (eh, check_reloc_target_type);
49 HOOK (eh, symbol_type_name); 52 HOOK (eh, symbol_type_name);
50Index: elfutils-0.164/backends/arm_regs.c 53Index: b/backends/arm_regs.c
51=================================================================== 54===================================================================
52--- elfutils-0.164.orig/backends/arm_regs.c 55--- a/backends/arm_regs.c
53+++ elfutils-0.164/backends/arm_regs.c 56+++ b/backends/arm_regs.c
54@@ -31,6 +31,7 @@ 57@@ -31,6 +31,7 @@
55 #endif 58 #endif
56 59
@@ -209,10 +212,10 @@ Index: elfutils-0.164/backends/arm_regs.c
209 *setname = "VFP"; 212 *setname = "VFP";
210 *type = DW_ATE_float; 213 *type = DW_ATE_float;
211 *bits = 64; 214 *bits = 64;
212Index: elfutils-0.164/backends/arm_retval.c 215Index: b/backends/arm_retval.c
213=================================================================== 216===================================================================
214--- elfutils-0.164.orig/backends/arm_retval.c 217--- a/backends/arm_retval.c
215+++ elfutils-0.164/backends/arm_retval.c 218+++ b/backends/arm_retval.c
216@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] = 219@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] =
217 #define nloc_intreg 1 220 #define nloc_intreg 1
218 #define nloc_intregs(n) (2 * (n)) 221 #define nloc_intregs(n) (2 * (n))
@@ -288,11 +291,11 @@ Index: elfutils-0.164/backends/arm_retval.c
288+ return arm_return_value_location_ (functypedie, locp, 0); 291+ return arm_return_value_location_ (functypedie, locp, 0);
289+} 292+}
290+ 293+
291Index: elfutils-0.164/libelf/elf.h 294Index: b/libelf/elf.h
292=================================================================== 295===================================================================
293--- elfutils-0.164.orig/libelf/elf.h 296--- a/libelf/elf.h
294+++ elfutils-0.164/libelf/elf.h 297+++ b/libelf/elf.h
295@@ -2450,6 +2450,9 @@ enum 298@@ -2593,6 +2593,9 @@ enum
296 #define EF_ARM_EABI_VER4 0x04000000 299 #define EF_ARM_EABI_VER4 0x04000000
297 #define EF_ARM_EABI_VER5 0x05000000 300 #define EF_ARM_EABI_VER5 0x05000000
298 301
@@ -302,7 +305,7 @@ Index: elfutils-0.164/libelf/elf.h
302 /* Additional symbol types for Thumb. */ 305 /* Additional symbol types for Thumb. */
303 #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ 306 #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */
304 #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ 307 #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */
305@@ -2467,12 +2470,19 @@ enum 308@@ -2610,12 +2613,19 @@ enum
306 309
307 /* Processor specific values for the Phdr p_type field. */ 310 /* Processor specific values for the Phdr p_type field. */
308 #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ 311 #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */
@@ -322,7 +325,7 @@ Index: elfutils-0.164/libelf/elf.h
322 325
323 /* AArch64 relocs. */ 326 /* AArch64 relocs. */
324 327
325@@ -2765,6 +2775,7 @@ enum 328@@ -2908,6 +2918,7 @@ enum
326 TLS block (LDR, STR). */ 329 TLS block (LDR, STR). */
327 #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative 330 #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative
328 to GOT origin (LDR). */ 331 to GOT origin (LDR). */
@@ -330,10 +333,10 @@ Index: elfutils-0.164/libelf/elf.h
330 #define R_ARM_ME_TOO 128 /* Obsolete. */ 333 #define R_ARM_ME_TOO 128 /* Obsolete. */
331 #define R_ARM_THM_TLS_DESCSEQ 129 334 #define R_ARM_THM_TLS_DESCSEQ 129
332 #define R_ARM_THM_TLS_DESCSEQ16 129 335 #define R_ARM_THM_TLS_DESCSEQ16 129
333Index: elfutils-0.164/backends/libebl_arm.h 336Index: b/backends/libebl_arm.h
334=================================================================== 337===================================================================
335--- /dev/null 338--- /dev/null
336+++ elfutils-0.164/backends/libebl_arm.h 339+++ b/backends/libebl_arm.h
337@@ -0,0 +1,9 @@ 340@@ -0,0 +1,9 @@
338+#ifndef _LIBEBL_ARM_H 341+#ifndef _LIBEBL_ARM_H
339+#define _LIBEBL_ARM_H 1 342+#define _LIBEBL_ARM_H 1
@@ -344,10 +347,10 @@ Index: elfutils-0.164/backends/libebl_arm.h
344+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); 347+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp);
345+ 348+
346+#endif 349+#endif
347Index: elfutils-0.164/tests/run-allregs.sh 350Index: b/tests/run-allregs.sh
348=================================================================== 351===================================================================
349--- elfutils-0.164.orig/tests/run-allregs.sh 352--- a/tests/run-allregs.sh
350+++ elfutils-0.164/tests/run-allregs.sh 353+++ b/tests/run-allregs.sh
351@@ -2672,7 +2672,28 @@ integer registers: 354@@ -2672,7 +2672,28 @@ integer registers:
352 13: sp (sp), address 32 bits 355 13: sp (sp), address 32 bits
353 14: lr (lr), address 32 bits 356 14: lr (lr), address 32 bits
@@ -465,10 +468,10 @@ Index: elfutils-0.164/tests/run-allregs.sh
465 EOF 468 EOF
466 469
467 # See run-readelf-mixed-corenote.sh for instructions to regenerate 470 # See run-readelf-mixed-corenote.sh for instructions to regenerate
468Index: elfutils-0.164/tests/run-readelf-mixed-corenote.sh 471Index: b/tests/run-readelf-mixed-corenote.sh
469=================================================================== 472===================================================================
470--- elfutils-0.164.orig/tests/run-readelf-mixed-corenote.sh 473--- a/tests/run-readelf-mixed-corenote.sh
471+++ elfutils-0.164/tests/run-readelf-mixed-corenote.sh 474+++ b/tests/run-readelf-mixed-corenote.sh
472@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x27 475@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x27
473 pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 476 pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063
474 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000 477 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000
@@ -487,10 +490,10 @@ Index: elfutils-0.164/tests/run-readelf-mixed-corenote.sh
487 CORE 124 PRPSINFO 490 CORE 124 PRPSINFO
488 state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500 491 state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500
489 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 492 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063
490Index: elfutils-0.164/tests/run-addrcfi.sh 493Index: b/tests/run-addrcfi.sh
491=================================================================== 494===================================================================
492--- elfutils-0.164.orig/tests/run-addrcfi.sh 495--- a/tests/run-addrcfi.sh
493+++ elfutils-0.164/tests/run-addrcfi.sh 496+++ b/tests/run-addrcfi.sh
494@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matc 497@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matc
495 FPA reg21 (f5): undefined 498 FPA reg21 (f5): undefined
496 FPA reg22 (f6): undefined 499 FPA reg22 (f6): undefined
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hppa_backend.diff
index 45456715a3..44fda7f305 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hppa_backend.diff
@@ -1,7 +1,10 @@
1Index: elfutils-0.164/backends/parisc_init.c 1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3
4Index: b/backends/parisc_init.c
2=================================================================== 5===================================================================
3--- /dev/null 6--- /dev/null
4+++ elfutils-0.164/backends/parisc_init.c 7+++ b/backends/parisc_init.c
5@@ -0,0 +1,73 @@ 8@@ -0,0 +1,73 @@
6+/* Initialization of PA-RISC specific backend library. 9+/* Initialization of PA-RISC specific backend library.
7+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc. 10+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc.
@@ -76,10 +79,10 @@ Index: elfutils-0.164/backends/parisc_init.c
76+ 79+
77+ return MODVERSION; 80+ return MODVERSION;
78+} 81+}
79Index: elfutils-0.164/backends/parisc_regs.c 82Index: b/backends/parisc_regs.c
80=================================================================== 83===================================================================
81--- /dev/null 84--- /dev/null
82+++ elfutils-0.164/backends/parisc_regs.c 85+++ b/backends/parisc_regs.c
83@@ -0,0 +1,159 @@ 86@@ -0,0 +1,159 @@
84+/* Register names and numbers for PA-RISC DWARF. 87+/* Register names and numbers for PA-RISC DWARF.
85+ Copyright (C) 2005, 2006 Red Hat, Inc. 88+ Copyright (C) 2005, 2006 Red Hat, Inc.
@@ -240,10 +243,10 @@ Index: elfutils-0.164/backends/parisc_regs.c
240+ name[namelen++] = '\0'; 243+ name[namelen++] = '\0';
241+ return namelen; 244+ return namelen;
242+} 245+}
243Index: elfutils-0.164/backends/parisc_reloc.def 246Index: b/backends/parisc_reloc.def
244=================================================================== 247===================================================================
245--- /dev/null 248--- /dev/null
246+++ elfutils-0.164/backends/parisc_reloc.def 249+++ b/backends/parisc_reloc.def
247@@ -0,0 +1,128 @@ 250@@ -0,0 +1,128 @@
248+/* List the relocation types for PA-RISC. -*- C -*- 251+/* List the relocation types for PA-RISC. -*- C -*-
249+ Copyright (C) 2005 Red Hat, Inc. 252+ Copyright (C) 2005 Red Hat, Inc.
@@ -373,10 +376,10 @@ Index: elfutils-0.164/backends/parisc_reloc.def
373+RELOC_TYPE (TLS_DTPMOD64, DYN) 376+RELOC_TYPE (TLS_DTPMOD64, DYN)
374+ 377+
375+#define NO_RELATIVE_RELOC 1 378+#define NO_RELATIVE_RELOC 1
376Index: elfutils-0.164/backends/parisc_retval.c 379Index: b/backends/parisc_retval.c
377=================================================================== 380===================================================================
378--- /dev/null 381--- /dev/null
379+++ elfutils-0.164/backends/parisc_retval.c 382+++ b/backends/parisc_retval.c
380@@ -0,0 +1,213 @@ 383@@ -0,0 +1,213 @@
381+/* Function return value location for Linux/PA-RISC ABI. 384+/* Function return value location for Linux/PA-RISC ABI.
382+ Copyright (C) 2005 Red Hat, Inc. 385+ Copyright (C) 2005 Red Hat, Inc.
@@ -591,10 +594,10 @@ Index: elfutils-0.164/backends/parisc_retval.c
591+ return parisc_return_value_location_ (functypedie, locp, 1); 594+ return parisc_return_value_location_ (functypedie, locp, 1);
592+} 595+}
593+ 596+
594Index: elfutils-0.164/backends/parisc_symbol.c 597Index: b/backends/parisc_symbol.c
595=================================================================== 598===================================================================
596--- /dev/null 599--- /dev/null
597+++ elfutils-0.164/backends/parisc_symbol.c 600+++ b/backends/parisc_symbol.c
598@@ -0,0 +1,112 @@ 601@@ -0,0 +1,112 @@
599+/* PA-RISC specific symbolic name handling. 602+/* PA-RISC specific symbolic name handling.
600+ Copyright (C) 2002, 2005 Red Hat, Inc. 603+ Copyright (C) 2002, 2005 Red Hat, Inc.
@@ -708,10 +711,10 @@ Index: elfutils-0.164/backends/parisc_symbol.c
708+ return ELF_T_NUM; 711+ return ELF_T_NUM;
709+ } 712+ }
710+} 713+}
711Index: elfutils-0.164/backends/libebl_parisc.h 714Index: b/backends/libebl_parisc.h
712=================================================================== 715===================================================================
713--- /dev/null 716--- /dev/null
714+++ elfutils-0.164/backends/libebl_parisc.h 717+++ b/backends/libebl_parisc.h
715@@ -0,0 +1,9 @@ 718@@ -0,0 +1,9 @@
716+#ifndef _LIBEBL_HPPA_H 719+#ifndef _LIBEBL_HPPA_H
717+#define _LIBEBL_HPPA_H 1 720+#define _LIBEBL_HPPA_H 1
@@ -722,28 +725,28 @@ Index: elfutils-0.164/backends/libebl_parisc.h
722+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp); 725+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp);
723+ 726+
724+#endif 727+#endif
725Index: elfutils-0.164/backends/Makefile.am 728Index: b/backends/Makefile.am
726=================================================================== 729===================================================================
727--- elfutils-0.164.orig/backends/Makefile.am 730--- a/backends/Makefile.am
728+++ elfutils-0.164/backends/Makefile.am 731+++ b/backends/Makefile.am
729@@ -33,11 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I 732@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
730 733
731 734
732 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ 735 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
733- tilegx 736- tilegx m68k bpf
734+ tilegx parisc 737+ tilegx m68k bpf parisc
735 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 738 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
736 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 739 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
737 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ 740 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
738- libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a 741 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
739+ libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ 742- libebl_m68k_pic.a libebl_bpf_pic.a
740+ libebl_parisc_pic.a 743+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a
741 noinst_LIBRARIES = $(libebl_pic) 744 noinst_LIBRARIES = $(libebl_pic)
742 noinst_DATA = $(libebl_pic:_pic.a=.so) 745 noinst_DATA = $(libebl_pic:_pic.a=.so)
743 746
744@@ -111,6 +112,9 @@ tilegx_SRCS = tilegx_init.c tilegx_symbo 747@@ -128,6 +128,9 @@ endif
745 libebl_tilegx_pic_a_SOURCES = $(tilegx_SRCS) 748 libebl_bpf_pic_a_SOURCES = $(bpf_SRCS)
746 am_libebl_tilegx_pic_a_OBJECTS = $(tilegx_SRCS:.c=.os) 749 am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os)
747 750
748+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c 751+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c
749+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) 752+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
@@ -751,11 +754,11 @@ Index: elfutils-0.164/backends/Makefile.am
751 754
752 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) 755 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
753 @rm -f $(@:.so=.map) 756 @rm -f $(@:.so=.map)
754Index: elfutils-0.164/libelf/elf.h 757Index: b/libelf/elf.h
755=================================================================== 758===================================================================
756--- elfutils-0.164.orig/libelf/elf.h 759--- a/libelf/elf.h
757+++ elfutils-0.164/libelf/elf.h 760+++ b/libelf/elf.h
758@@ -1912,16 +1912,24 @@ enum 761@@ -2055,16 +2055,24 @@ enum
759 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ 762 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
760 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ 763 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
761 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ 764 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
@@ -780,7 +783,7 @@ Index: elfutils-0.164/libelf/elf.h
780 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ 783 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
781 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ 784 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
782 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ 785 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
783@@ -1930,6 +1938,7 @@ enum 786@@ -2073,6 +2081,7 @@ enum
784 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ 787 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */
785 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ 788 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */
786 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ 789 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
@@ -788,7 +791,7 @@ Index: elfutils-0.164/libelf/elf.h
788 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ 791 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
789 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ 792 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
790 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ 793 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
791@@ -1955,6 +1964,8 @@ enum 794@@ -2098,6 +2107,8 @@ enum
792 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ 795 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
793 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ 796 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
794 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ 797 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
new file mode 100644
index 0000000000..a4d568b084
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
@@ -0,0 +1,17 @@
1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3
4Index: elfutils-0.165/tests/run-native-test.sh
5===================================================================
6--- elfutils-0.165.orig/tests/run-native-test.sh
7+++ elfutils-0.165/tests/run-native-test.sh
8@@ -83,6 +83,9 @@ native_test()
9 # "cannot attach to process: Function not implemented".
10 [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77
11
12+# hurd's /proc/$PID/maps does not give paths yet.
13+[ "$(uname)" = "GNU" ] && exit 77
14+
15 native_test ${abs_builddir}/allregs
16 native_test ${abs_builddir}/funcretval
17
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
new file mode 100644
index 0000000000..3570deca9e
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
@@ -0,0 +1,14 @@
1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3
4--- elfutils-0.165.orig/tests/run-strip-strmerge.sh
5+++ elfutils-0.165/tests/run-strip-strmerge.sh
6@@ -30,7 +30,7 @@ remerged=remerged.elf
7 tempfiles $merged $stripped $debugfile $remerged
8
9 echo elflint $input
10-testrun ${abs_top_builddir}/src/elflint --gnu $input
11+testrun_on_self_skip ${abs_top_builddir}/src/elflint --gnu $input
12 echo elfstrmerge
13 testrun ${abs_top_builddir}/tests/elfstrmerge -o $merged $input
14 echo elflint $merged
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/kfreebsd_path.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
index ba454ee77c..49085d1c86 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/kfreebsd_path.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
@@ -1,6 +1,11 @@
1--- elfutils/tests/run-native-test.sh.orig 1Upstream-Status: Backport [from debian]
2+++ elfutils/tests/run-native-test.sh 2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3@@ -78,6 +78,12 @@ 3
4Index: b/tests/run-native-test.sh
5===================================================================
6--- a/tests/run-native-test.sh
7+++ b/tests/run-native-test.sh
8@@ -77,6 +77,12 @@ native_test()
4 test $native -eq 0 || testrun "$@" -p $native > /dev/null 9 test $native -eq 0 || testrun "$@" -p $native > /dev/null
5 } 10 }
6 11
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff
index de1237be09..a5e76dda4a 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/mips_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff
@@ -1,7 +1,10 @@
1Index: elfutils-0.164/backends/mips_init.c 1Upstream-Status: Backport [from debian]
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
3
4Index: b/backends/mips_init.c
2=================================================================== 5===================================================================
3--- /dev/null 6--- /dev/null
4+++ elfutils-0.164/backends/mips_init.c 7+++ b/backends/mips_init.c
5@@ -0,0 +1,59 @@ 8@@ -0,0 +1,59 @@
6+/* Initialization of mips specific backend library. 9+/* Initialization of mips specific backend library.
7+ Copyright (C) 2006 Red Hat, Inc. 10+ Copyright (C) 2006 Red Hat, Inc.
@@ -62,10 +65,10 @@ Index: elfutils-0.164/backends/mips_init.c
62+ 65+
63+ return MODVERSION; 66+ return MODVERSION;
64+} 67+}
65Index: elfutils-0.164/backends/mips_regs.c 68Index: b/backends/mips_regs.c
66=================================================================== 69===================================================================
67--- /dev/null 70--- /dev/null
68+++ elfutils-0.164/backends/mips_regs.c 71+++ b/backends/mips_regs.c
69@@ -0,0 +1,104 @@ 72@@ -0,0 +1,104 @@
70+/* Register names and numbers for MIPS DWARF. 73+/* Register names and numbers for MIPS DWARF.
71+ Copyright (C) 2006 Red Hat, Inc. 74+ Copyright (C) 2006 Red Hat, Inc.
@@ -171,10 +174,10 @@ Index: elfutils-0.164/backends/mips_regs.c
171+ name[namelen++] = '\0'; 174+ name[namelen++] = '\0';
172+ return namelen; 175+ return namelen;
173+} 176+}
174Index: elfutils-0.164/backends/mips_reloc.def 177Index: b/backends/mips_reloc.def
175=================================================================== 178===================================================================
176--- /dev/null 179--- /dev/null
177+++ elfutils-0.164/backends/mips_reloc.def 180+++ b/backends/mips_reloc.def
178@@ -0,0 +1,79 @@ 181@@ -0,0 +1,79 @@
179+/* List the relocation types for mips. -*- C -*- 182+/* List the relocation types for mips. -*- C -*-
180+ Copyright (C) 2006 Red Hat, Inc. 183+ Copyright (C) 2006 Red Hat, Inc.
@@ -255,10 +258,10 @@ Index: elfutils-0.164/backends/mips_reloc.def
255+ 258+
256+#define NO_COPY_RELOC 1 259+#define NO_COPY_RELOC 1
257+#define NO_RELATIVE_RELOC 1 260+#define NO_RELATIVE_RELOC 1
258Index: elfutils-0.164/backends/mips_retval.c 261Index: b/backends/mips_retval.c
259=================================================================== 262===================================================================
260--- /dev/null 263--- /dev/null
261+++ elfutils-0.164/backends/mips_retval.c 264+++ b/backends/mips_retval.c
262@@ -0,0 +1,321 @@ 265@@ -0,0 +1,321 @@
263+/* Function return value location for Linux/mips ABI. 266+/* Function return value location for Linux/mips ABI.
264+ Copyright (C) 2005 Red Hat, Inc. 267+ Copyright (C) 2005 Red Hat, Inc.
@@ -581,10 +584,10 @@ Index: elfutils-0.164/backends/mips_retval.c
581+ DWARF and might be valid. */ 584+ DWARF and might be valid. */
582+ return -2; 585+ return -2;
583+} 586+}
584Index: elfutils-0.164/backends/mips_symbol.c 587Index: b/backends/mips_symbol.c
585=================================================================== 588===================================================================
586--- /dev/null 589--- /dev/null
587+++ elfutils-0.164/backends/mips_symbol.c 590+++ b/backends/mips_symbol.c
588@@ -0,0 +1,52 @@ 591@@ -0,0 +1,52 @@
589+/* MIPS specific symbolic name handling. 592+/* MIPS specific symbolic name handling.
590+ Copyright (C) 2002, 2003, 2005 Red Hat, Inc. 593+ Copyright (C) 2002, 2003, 2005 Red Hat, Inc.
@@ -638,10 +641,10 @@ Index: elfutils-0.164/backends/mips_symbol.c
638+ return ELF_T_NUM; 641+ return ELF_T_NUM;
639+ } 642+ }
640+} 643+}
641Index: elfutils-0.164/libebl/eblopenbackend.c 644Index: b/libebl/eblopenbackend.c
642=================================================================== 645===================================================================
643--- elfutils-0.164.orig/libebl/eblopenbackend.c 646--- a/libebl/eblopenbackend.c
644+++ elfutils-0.164/libebl/eblopenbackend.c 647+++ b/libebl/eblopenbackend.c
645@@ -71,6 +71,8 @@ static const struct 648@@ -71,6 +71,8 @@ static const struct
646 { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 }, 649 { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
647 { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 }, 650 { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
@@ -650,55 +653,27 @@ Index: elfutils-0.164/libebl/eblopenbackend.c
650+ { "mips", "elf_mipsel", "mipsel", 4, EM_MIPS_RS3_LE, 0, 0 }, 653+ { "mips", "elf_mipsel", "mipsel", 4, EM_MIPS_RS3_LE, 0, 0 },
651 654
652 { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 }, 655 { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 },
653 { "m68k", "elf_m68k", "m68k", 4, EM_68K, 0, 0 }, 656 { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
654Index: elfutils-0.164/backends/common-reloc.c 657Index: b/backends/Makefile.am
655=================================================================== 658===================================================================
656--- elfutils-0.164.orig/backends/common-reloc.c 659--- a/backends/Makefile.am
657+++ elfutils-0.164/backends/common-reloc.c 660+++ b/backends/Makefile.am
658@@ -125,11 +125,13 @@ EBLHOOK(reloc_valid_use) (Elf *elf, int
659 }
660
661
662+#ifndef NO_COPY_RELOC
663 bool
664 EBLHOOK(copy_reloc_p) (int reloc)
665 {
666 return reloc == R_TYPE (COPY);
667 }
668+#endif
669
670 bool
671 EBLHOOK(none_reloc_p) (int reloc)
672@@ -151,7 +153,9 @@ EBLHOOK(init_reloc) (Ebl *ebl)
673 ebl->reloc_type_name = EBLHOOK(reloc_type_name);
674 ebl->reloc_type_check = EBLHOOK(reloc_type_check);
675 ebl->reloc_valid_use = EBLHOOK(reloc_valid_use);
676+#ifndef NO_COPY_RELOC
677 ebl->copy_reloc_p = EBLHOOK(copy_reloc_p);
678+#endif
679 ebl->none_reloc_p = EBLHOOK(none_reloc_p);
680 #ifndef NO_RELATIVE_RELOC
681 ebl->relative_reloc_p = EBLHOOK(relative_reloc_p);
682Index: elfutils-0.164/backends/Makefile.am
683===================================================================
684--- elfutils-0.164.orig/backends/Makefile.am
685+++ elfutils-0.164/backends/Makefile.am
686@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I 661@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
687 662
688 663
689 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ 664 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
690- tilegx parisc 665- tilegx m68k bpf parisc
691+ tilegx parisc mips 666+ tilegx m68k bpf parisc mips
692 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 667 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
693 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 668 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
694 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ 669 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
695 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ 670 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
696- libebl_parisc_pic.a 671- libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a
697+ libebl_parisc_pic.a libebl_mips_pic.a 672+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a libebl_mips_pic.a
698 noinst_LIBRARIES = $(libebl_pic) 673 noinst_LIBRARIES = $(libebl_pic)
699 noinst_DATA = $(libebl_pic:_pic.a=.so) 674 noinst_DATA = $(libebl_pic:_pic.a=.so)
700 675
701@@ -116,6 +116,10 @@ parisc_SRCS = parisc_init.c parisc_symbo 676@@ -132,6 +132,10 @@ parisc_SRCS = parisc_init.c parisc_symbo
702 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) 677 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
703 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) 678 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
704 679
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_readelf_w.patch
index 930d6f664e..790930cf35 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/mips_readelf_w.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_readelf_w.patch
@@ -6,11 +6,14 @@ Forwarded: not-needed
6Upstreams wants a change where this is handled by a hook that needs 6Upstreams wants a change where this is handled by a hook that needs
7to be filled in by the backend for the arch. 7to be filled in by the backend for the arch.
8 8
9Index: elfutils-0.164/src/readelf.c 9Upstream-Status: Backport [from debian]
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11
12Index: b/src/readelf.c
10=================================================================== 13===================================================================
11--- elfutils-0.164.orig/src/readelf.c 14--- a/src/readelf.c
12+++ elfutils-0.164/src/readelf.c 15+++ b/src/readelf.c
13@@ -8218,7 +8218,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl * 16@@ -8343,7 +8343,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl *
14 GElf_Shdr shdr_mem; 17 GElf_Shdr shdr_mem;
15 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); 18 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
16 19
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
index eae5796de3..3df35768b7 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/testsuite-ignore-elflint.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
@@ -4,21 +4,24 @@ binutils don't pass elflint. However elfutils shouldn't FTBFS because of this.
4So we run the tests on all archs to see what breaks, but if it breaks we ignore 4So we run the tests on all archs to see what breaks, but if it breaks we ignore
5the result (exitcode 77 means: this test was skipped). 5the result (exitcode 77 means: this test was skipped).
6 6
7Index: elfutils-0.156/tests/run-elflint-self.sh 7Upstream-Status: Backport [from debian]
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9
10Index: b/tests/run-elflint-self.sh
8=================================================================== 11===================================================================
9--- elfutils-0.156.orig/tests/run-elflint-self.sh 2013-07-28 14:35:36.000000000 +0200 12--- a/tests/run-elflint-self.sh
10+++ elfutils-0.156/tests/run-elflint-self.sh 2013-07-28 14:36:10.000000000 +0200 13+++ b/tests/run-elflint-self.sh
11@@ -18,4 +18,4 @@ 14@@ -18,4 +18,4 @@
12 15
13 . $srcdir/test-subr.sh 16 . $srcdir/test-subr.sh
14 17
15-testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld 18-testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld
16+testrun_on_self_skip ${abs_top_builddir}/src/elflint --quiet --gnu-ld 19+testrun_on_self_skip ${abs_top_builddir}/src/elflint --quiet --gnu-ld
17Index: elfutils-0.156/tests/test-subr.sh 20Index: b/tests/test-subr.sh
18=================================================================== 21===================================================================
19--- elfutils-0.156.orig/tests/test-subr.sh 2013-07-28 14:35:36.000000000 +0200 22--- a/tests/test-subr.sh
20+++ elfutils-0.156/tests/test-subr.sh 2013-07-28 14:35:36.000000000 +0200 23+++ b/tests/test-subr.sh
21@@ -149,3 +149,18 @@ 24@@ -152,3 +152,18 @@ testrun_on_self_quiet()
22 # Only exit if something failed 25 # Only exit if something failed
23 if test $exit_status != 0; then exit $exit_status; fi 26 if test $exit_status != 0; then exit $exit_status; fi
24 } 27 }
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch
index 5de3b24c85..5de3b24c85 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.166/shadow.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
index d31961f94f..d31961f94f 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.166/shadow.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.166.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb
index 5c436d3864..96e895aebf 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.166.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb
@@ -7,8 +7,8 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl"
7DEPENDS_append_libc-musl = " argp-standalone fts " 7DEPENDS_append_libc-musl = " argp-standalone fts "
8 8
9SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/${BP}.tar.bz2" 9SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/${BP}.tar.bz2"
10SRC_URI[md5sum] = "d4e462b7891915dc5326bccefa2024ff" 10SRC_URI[md5sum] = "52adfa40758d0d39e5d5c57689bf38d6"
11SRC_URI[sha256sum] = "3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30" 11SRC_URI[sha256sum] = "b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276"
12 12
13SRC_URI += "\ 13SRC_URI += "\
14 file://dso-link-change.patch \ 14 file://dso-link-change.patch \
@@ -22,20 +22,19 @@ SRC_URI += "\
22" 22"
23 23
24# pick the patch from debian 24# pick the patch from debian
25# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.164-1.debian.tar.xz 25# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.168-0.2.debian.tar.xz
26SRC_URI += "\ 26SRC_URI += "\
27 file://hppa_backend.diff \ 27 file://debian/hppa_backend.diff \
28 file://arm_backend.diff \ 28 file://debian/arm_backend.diff \
29 file://mips_backend.diff \ 29 file://debian/mips_backend.diff \
30 file://m68k_backend.diff \ 30 file://debian/testsuite-ignore-elflint.diff \
31 file://testsuite-ignore-elflint.diff \ 31 file://debian/mips_readelf_w.patch \
32 file://mips_readelf_w.patch \ 32 file://debian/kfreebsd_path.patch \
33 file://kfreebsd_path.patch \ 33 file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \
34 file://0001-Ignore-differences-between-mips-machine-identifiers.patch \ 34 file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \
35 file://0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \ 35 file://debian/0003-Add-mips-n64-relocation-format-hack.patch \
36 file://0003-Add-mips-n64-relocation-format-hack.patch \ 36 file://debian/hurd_path.patch \
37 file://uclibc-support.patch \ 37 file://debian/ignore_strmerge.diff \
38 file://elfcmp-fix-self-comparision.patch \
39" 38"
40SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch " 39SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch "
41 40
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-07 17:12:20 +0000