summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-07-02 13:57:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-04 00:02:16 +0100
commit60857bd2d4c4f78e452f131fa763a86ed56fc22e (patch)
tree2c70fbaa0a458cfc683cd1c39ef1786e3b6bc707 /meta/recipes-devtools
parentb07db23759b92d592a312e3472720212bb5a724e (diff)
downloadpoky-60857bd2d4c4f78e452f131fa763a86ed56fc22e.tar.gz
elfutils: 0.170 -> 0.172
- Update debian 0.170 patches and rebase them for 0.172; - Drop 0001-Use-fallthrough-attribute.patch which was accepted by upstream; - Drop 0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch which was backported from upstream; (From OE-Core rev: dbbe9c1d1f822cf13a4c16b79bccf6bf5c4b91e4) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.172.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.170.bb)22
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch8
-rw-r--r--meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch12
-rw-r--r--meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch6
-rw-r--r--meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch8
-rw-r--r--meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch12
-rw-r--r--meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch201
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch4
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch (renamed from meta/recipes-devtools/elfutils/files/debian/arm_backend.diff)322
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch35
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch57
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch (renamed from meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff)170
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch (renamed from meta/recipes-devtools/elfutils/files/debian/mips_backend.patch)31
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch39
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch57
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch3
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch5
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/hurd_path.patch14
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff11
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch17
-rw-r--r--meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch25
24 files changed, 649 insertions, 422 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.170.bb b/meta/recipes-devtools/elfutils/elfutils_0.172.bb
index 14ac22ee64..04f6709d5a 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.170.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.172.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6DEPENDS = "libtool bzip2 zlib virtual/libintl" 6DEPENDS = "libtool bzip2 zlib virtual/libintl"
7DEPENDS_append_libc-musl = " argp-standalone fts " 7DEPENDS_append_libc-musl = " argp-standalone fts "
8# The Debian patches below are from: 8# The Debian patches below are from:
9# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.168-0.2.debian.tar.xz 9# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
10SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ 10SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
11 file://0001-dso-link-change.patch \ 11 file://0001-dso-link-change.patch \
12 file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ 12 file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
@@ -16,19 +16,23 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
16 file://0006-Fix-build-on-aarch64-musl.patch \ 16 file://0006-Fix-build-on-aarch64-musl.patch \
17 file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \ 17 file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \
18 file://0001-libasm-may-link-with-libbz2-if-found.patch \ 18 file://0001-libasm-may-link-with-libbz2-if-found.patch \
19 file://debian/hppa_backend.diff \ 19 file://debian/0001-hppa_backend.patch \
20 file://debian/arm_backend.diff \ 20 file://debian/0001-arm_backend.patch \
21 file://debian/mips_backend.patch \ 21 file://debian/0001-mips_backend.patch \
22 file://debian/mips_readelf_w.patch \ 22 file://debian/0001-testsuite-ignore-elflint.patch \
23 file://debian/0001-mips_readelf_w.patch \
24 file://debian/kfreebsd_path.patch \
23 file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \ 25 file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \
24 file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \ 26 file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \
25 file://debian/0003-Add-mips-n64-relocation-format-hack.patch \ 27 file://debian/0003-Add-mips-n64-relocation-format-hack.patch \
26 file://0001-Use-fallthrough-attribute.patch \ 28 file://debian/hurd_path.patch \
27 file://0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch \ 29 file://debian/ignore_strmerge.diff \
30 file://debian/0001-fix-gcc7-ftbfs.patch \
31 file://debian/0001-disable_werror.patch \
28 " 32 "
29SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch" 33SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
30SRC_URI[md5sum] = "03599aee98c9b726c7a732a2dd0245d5" 34SRC_URI[md5sum] = "01e87ab4c5a6a249c04e22a97a4221d3"
31SRC_URI[sha256sum] = "1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066" 35SRC_URI[sha256sum] = "779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24"
32 36
33inherit autotools gettext 37inherit autotools gettext
34 38
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
index 28c57f236c..4c62dc511c 100644
--- a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
@@ -1,4 +1,4 @@
1From 0a69a26c9f7487daca900db87cd1195857a4603f Mon Sep 17 00:00:00 2001 1From c9c6d2414651dbf163dc4963c3c3d6f5cacef898 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:10:57 +0800 3Date: Tue, 15 Aug 2017 17:10:57 +0800
4Subject: [PATCH 1/7] dso link change 4Subject: [PATCH 1/7] dso link change
@@ -35,10 +35,10 @@ index 2b1c0dc..9305b84 100644
35 endif 35 endif
36 libebl = ../libebl/libebl.a 36 libebl = ../libebl/libebl.a
37diff --git a/tests/Makefile.am b/tests/Makefile.am 37diff --git a/tests/Makefile.am b/tests/Makefile.am
38index 3735084..528615d 100644 38index b45ecdc..dd256fb 100644
39--- a/tests/Makefile.am 39--- a/tests/Makefile.am
40+++ b/tests/Makefile.am 40+++ b/tests/Makefile.am
41@@ -400,7 +400,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl 41@@ -436,7 +436,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
42 libelf = ../libelf/libelf.a -lz 42 libelf = ../libelf/libelf.a -lz
43 libasm = ../libasm/libasm.a 43 libasm = ../libasm/libasm.a
44 else 44 else
@@ -48,5 +48,5 @@ index 3735084..528615d 100644
48 libasm = ../libasm/libasm.so 48 libasm = ../libasm/libasm.so
49 endif 49 endif
50-- 50--
511.8.3.1 512.7.4
52 52
diff --git a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
index fb0b060b4b..a8e9e50d15 100644
--- a/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
+++ b/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
@@ -1,4 +1,4 @@
1From 7672e363468271b4c63ff58770c5aac15ab8f722 Mon Sep 17 00:00:00 2001 1From 74629016e76343a4bf39915c9192b6bf26a57c2d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 Oct 2017 22:30:46 -0700 3Date: Wed, 4 Oct 2017 22:30:46 -0700
4Subject: [PATCH] libasm may link with libbz2 if found 4Subject: [PATCH] libasm may link with libbz2 if found
@@ -11,13 +11,11 @@ where indirect libraries may be not found by linker
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 13---
14Upstream-Status: Pending 14 src/Makefile.am | 4 ++--
15 15 1 file changed, 2 insertions(+), 2 deletions(-)
16 src/Makefile.am | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18 16
19diff --git a/src/Makefile.am b/src/Makefile.am 17diff --git a/src/Makefile.am b/src/Makefile.am
20index e03bc32..9b7e853 100644 18index 9305b84..9b7e853 100644
21--- a/src/Makefile.am 19--- a/src/Makefile.am
22+++ b/src/Makefile.am 20+++ b/src/Makefile.am
23@@ -39,11 +39,11 @@ EXTRA_DIST += make-debug-archive.in 21@@ -39,11 +39,11 @@ EXTRA_DIST += make-debug-archive.in
@@ -35,5 +33,5 @@ index e03bc32..9b7e853 100644
35 libelf = ../libelf/libelf.so 33 libelf = ../libelf/libelf.so
36 endif 34 endif
37-- 35--
382.14.2 362.7.4
39 37
diff --git a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
index 2f718eb827..86d26bdf35 100644
--- a/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
+++ b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
@@ -1,4 +1,4 @@
1From e98670f7c7b4c73fb65534949716fd8d043960d5 Mon Sep 17 00:00:00 2001 1From 9fd4bb05d3f2b7eaf9fe441bee26d3b1878d7cc7 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:13:59 +0800 3Date: Tue, 15 Aug 2017 17:13:59 +0800
4Subject: [PATCH 2/7] Fix elf_cvt_gunhash if dest and src are same. 4Subject: [PATCH 2/7] Fix elf_cvt_gunhash if dest and src are same.
@@ -38,5 +38,5 @@ index 6faf113..04d9ca1 100644
38 /* Now the 64 bit words. */ 38 /* Now the 64 bit words. */
39 Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4]; 39 Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4];
40-- 40--
411.8.3.1 412.7.4
42 42
diff --git a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
index 7c49fced10..d1c8e4143e 100644
--- a/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
@@ -1,4 +1,4 @@
1From 565d5935abf5b58773f9c8385c00189221980d98 Mon Sep 17 00:00:00 2001 1From 04fb3f65ec186df5231dd0c21780a55dcc03c868 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:17:20 +0800 3Date: Tue, 15 Aug 2017 17:17:20 +0800
4Subject: [PATCH 3/7] fixheadercheck 4Subject: [PATCH 3/7] fixheadercheck
@@ -21,7 +21,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21 1 file changed, 2 insertions(+), 2 deletions(-) 21 1 file changed, 2 insertions(+), 2 deletions(-)
22 22
23diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c 23diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
24index d83c0b3..a51bf70 100644 24index 3e9ef61..5351518 100644
25--- a/libelf/elf32_updatenull.c 25--- a/libelf/elf32_updatenull.c
26+++ b/libelf/elf32_updatenull.c 26+++ b/libelf/elf32_updatenull.c
27@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) 27@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
@@ -36,5 +36,5 @@ index d83c0b3..a51bf70 100644
36 __libelf_seterrno (ELF_E_INVALID_ALIGN); 36 __libelf_seterrno (ELF_E_INVALID_ALIGN);
37 return -1; 37 return -1;
38-- 38--
391.8.3.1 392.7.4
40 40
diff --git a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
index d893ad68f6..bf3a645bc6 100644
--- a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
+++ b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
@@ -1,4 +1,4 @@
1From bb7ed11950101798aae82f7fda8b3dcb05f755c5 Mon Sep 17 00:00:00 2001 1From dbc88349b9eed4268db951df2c3a8387f75a32e7 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:24:06 +0800 3Date: Tue, 15 Aug 2017 17:24:06 +0800
4Subject: [PATCH 4/7] Disable the test to convert euc-jp 4Subject: [PATCH 4/7] Disable the test to convert euc-jp
@@ -40,5 +40,5 @@ index a503646..299f1eb 100644
40 }]])], 40 }]])],
41 [am_cv_func_iconv_works=yes], 41 [am_cv_func_iconv_works=yes],
42-- 42--
431.8.3.1 432.7.4
44 44
diff --git a/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch b/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
index 22a01cfa71..e2966cbea4 100644
--- a/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
+++ b/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
@@ -1,4 +1,4 @@
1From dd6dbf6af396519380f48c0ef1ce6cf4dd77f6d7 Mon Sep 17 00:00:00 2001 1From 4d7ea681932556ad881f6841de90d0bfff56f8d7 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:25:16 +0800 3Date: Tue, 15 Aug 2017 17:25:16 +0800
4Subject: [PATCH 5/7] fix a stack-usage warning 4Subject: [PATCH 5/7] fix a stack-usage warning
@@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c 20diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
21index 69d623b..de41dec 100644 21index 3e4432f..59c2d97 100644
22--- a/backends/ppc_initreg.c 22--- a/backends/ppc_initreg.c
23+++ b/backends/ppc_initreg.c 23+++ b/backends/ppc_initreg.c
24@@ -93,7 +93,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), 24@@ -94,7 +94,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
25 return false; 25 return false;
26 } 26 }
27 const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr); 27 const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr);
@@ -31,5 +31,5 @@ index 69d623b..de41dec 100644
31 dwarf_regs[gpr] = user_regs.r.gpr[gpr]; 31 dwarf_regs[gpr] = user_regs.r.gpr[gpr];
32 if (! setfunc (0, gprs, dwarf_regs, arg)) 32 if (! setfunc (0, gprs, dwarf_regs, arg))
33-- 33--
341.8.3.1 342.7.4
35 35
diff --git a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
index 5f29a03759..40b8544fa5 100644
--- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+++ b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
@@ -1,4 +1,4 @@
1From e57ad47fc8549353ca80c23b9b4f38f31fde13e5 Mon Sep 17 00:00:00 2001 1From b4ec05953f78af26bcd7de45a5bbc5f138d023da Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:27:30 +0800 3Date: Tue, 15 Aug 2017 17:27:30 +0800
4Subject: [PATCH 6/7] Fix build on aarch64/musl 4Subject: [PATCH 6/7] Fix build on aarch64/musl
@@ -57,5 +57,5 @@ index efcabaf..062bb9e 100644
57 # include <sys/ptrace.h> 57 # include <sys/ptrace.h>
58 /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ 58 /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
59-- 59--
601.8.3.1 602.7.4
61 61
diff --git a/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch b/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
index 224770478d..bba420e349 100644
--- a/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
+++ b/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
@@ -1,6 +1,6 @@
1From 1e91c1d4e37c05cf95058b4b3c3f352d72886f58 Mon Sep 17 00:00:00 2001 1From 8eb100b2e51be5d473b0748a223e2e7f61ec606c Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:31:38 +0800 3Date: Fri, 29 Jun 2018 15:14:28 +0800
4Subject: [PATCH 7/7] Fix control path where we have str as uninitialized 4Subject: [PATCH 7/7] Fix control path where we have str as uninitialized
5 string 5 string
6 6
@@ -21,7 +21,7 @@ note: 'str' was declared here
21Signed-off-by: Khem Raj <raj.khem@gmail.com> 21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22Upstream-Status: Pending 22Upstream-Status: Pending
23 23
24Rebase to 0.170 24Rebase to 0.172
25 25
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27--- 27---
@@ -29,17 +29,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
29 1 file changed, 1 insertion(+) 29 1 file changed, 1 insertion(+)
30 30
31diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c 31diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
32index 831afbe..60fd6d4 100644 32index a7e03f9..837a3a8 100644
33--- a/libcpu/i386_disasm.c 33--- a/libcpu/i386_disasm.c
34+++ b/libcpu/i386_disasm.c 34+++ b/libcpu/i386_disasm.c
35@@ -821,6 +821,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)), 35@@ -821,6 +821,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)),
36 } 36 }
37 /* Fallthrough */ 37 FALLTHROUGH;
38 default: 38 default:
39+ str = ""; 39+ str = "";
40 assert (! "INVALID not handled"); 40 assert (! "INVALID not handled");
41 } 41 }
42 } 42 }
43-- 43--
441.8.3.1 442.7.4
45 45
diff --git a/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
index a42ce7b358..e88f2c069c 100644
--- a/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
+++ b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
@@ -1,16 +1,15 @@
1From ef0981744669149a00dd0439a54dac30de7b56a7 Mon Sep 17 00:00:00 2001 1From 207be05c44da5c4c31179a34660e176145ff8d4b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Aug 2017 10:06:26 +0800 3Date: Mon, 2 Jul 2018 09:52:23 +0800
4Subject: [PATCH] build: Provide alternatives for glibc assumptions helps 4Subject: [PATCH] build: Provide alternatives for glibc assumptions helps
5 compiling it on musl 5 compiling it on musl
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 9
10Rebase to 0.170 10Rebase to 0.172
11 11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
14--- 13---
15 Makefile.am | 2 +- 14 Makefile.am | 2 +-
16 lib/color.c | 3 ++- 15 lib/color.c | 3 ++-
@@ -24,10 +23,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
24 libcpu/i386_parse.c | 2 +- 23 libcpu/i386_parse.c | 2 +-
25 libdw/Makefile.am | 3 ++- 24 libdw/Makefile.am | 3 ++-
26 libdw/libdw_alloc.c | 2 +- 25 libdw/libdw_alloc.c | 2 +-
27 libdwfl/dwfl_build_id_find_elf.c | 3 ++- 26 libdwfl/dwfl_build_id_find_elf.c | 1 +
28 libdwfl/dwfl_error.c | 4 +++- 27 libdwfl/dwfl_error.c | 4 +++-
29 libdwfl/dwfl_module_getdwarf.c | 1 + 28 libdwfl/dwfl_module_getdwarf.c | 1 +
30 libdwfl/find-debuginfo.c | 2 +-
31 libdwfl/libdwfl_crc32_file.c | 9 +++++++++ 29 libdwfl/libdwfl_crc32_file.c | 9 +++++++++
32 libdwfl/linux-kernel-modules.c | 1 + 30 libdwfl/linux-kernel-modules.c | 1 +
33 libebl/eblopenbackend.c | 2 +- 31 libebl/eblopenbackend.c | 2 +-
@@ -75,16 +73,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
75 tests/getsrc_die.c | 2 +- 73 tests/getsrc_die.c | 2 +-
76 tests/line2addr.c | 2 +- 74 tests/line2addr.c | 2 +-
77 tests/low_high_pc.c | 2 +- 75 tests/low_high_pc.c | 2 +-
78 tests/md5-sha1-test.c | 2 +-
79 tests/rdwrmmap.c | 2 +- 76 tests/rdwrmmap.c | 2 +-
80 tests/saridx.c | 2 +- 77 tests/saridx.c | 2 +-
81 tests/sectiondump.c | 2 +- 78 tests/sectiondump.c | 2 +-
82 tests/varlocs.c | 2 +- 79 tests/varlocs.c | 2 +-
83 tests/vdsosyms.c | 2 +- 80 tests/vdsosyms.c | 2 +-
84 69 files changed, 95 insertions(+), 64 deletions(-) 81 67 files changed, 92 insertions(+), 61 deletions(-)
85 82
86diff --git a/Makefile.am b/Makefile.am 83diff --git a/Makefile.am b/Makefile.am
87index 2ff444e7..41f77df8 100644 84index 2ff444e..41f77df 100644
88--- a/Makefile.am 85--- a/Makefile.am
89+++ b/Makefile.am 86+++ b/Makefile.am
90@@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h 87@@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h
@@ -97,7 +94,7 @@ index 2ff444e7..41f77df8 100644
97 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ 94 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
98 COPYING COPYING-GPLV2 COPYING-LGPLV3 95 COPYING COPYING-GPLV2 COPYING-LGPLV3
99diff --git a/lib/color.c b/lib/color.c 96diff --git a/lib/color.c b/lib/color.c
100index f62389d5..a2a84b46 100644 97index f62389d..a2a84b4 100644
101--- a/lib/color.c 98--- a/lib/color.c
102+++ b/lib/color.c 99+++ b/lib/color.c
103@@ -32,13 +32,14 @@ 100@@ -32,13 +32,14 @@
@@ -117,7 +114,7 @@ index f62389d5..a2a84b46 100644
117 /* Prototype for option handler. */ 114 /* Prototype for option handler. */
118 static error_t parse_opt (int key, char *arg, struct argp_state *state); 115 static error_t parse_opt (int key, char *arg, struct argp_state *state);
119diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h 116diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
120index dac2a5f5..43016fc3 100644 117index dac2a5f..43016fc 100644
121--- a/lib/fixedsizehash.h 118--- a/lib/fixedsizehash.h
122+++ b/lib/fixedsizehash.h 119+++ b/lib/fixedsizehash.h
123@@ -30,7 +30,6 @@ 120@@ -30,7 +30,6 @@
@@ -129,7 +126,7 @@ index dac2a5f5..43016fc3 100644
129 #include <system.h> 126 #include <system.h>
130 127
131diff --git a/lib/system.h b/lib/system.h 128diff --git a/lib/system.h b/lib/system.h
132index 92033355..1a601319 100644 129index 9203335..1a60131 100644
133--- a/lib/system.h 130--- a/lib/system.h
134+++ b/lib/system.h 131+++ b/lib/system.h
135@@ -50,6 +50,16 @@ 132@@ -50,6 +50,16 @@
@@ -150,7 +147,7 @@ index 92033355..1a601319 100644
150 #ifndef MAX 147 #ifndef MAX
151 #define MAX(m, n) ((m) < (n) ? (n) : (m)) 148 #define MAX(m, n) ((m) < (n) ? (n) : (m))
152diff --git a/lib/xmalloc.c b/lib/xmalloc.c 149diff --git a/lib/xmalloc.c b/lib/xmalloc.c
153index 0cde384f..217b0541 100644 150index 0cde384..217b054 100644
154--- a/lib/xmalloc.c 151--- a/lib/xmalloc.c
155+++ b/lib/xmalloc.c 152+++ b/lib/xmalloc.c
156@@ -30,7 +30,7 @@ 153@@ -30,7 +30,7 @@
@@ -163,7 +160,7 @@ index 0cde384f..217b0541 100644
163 #include <stddef.h> 160 #include <stddef.h>
164 #include <stdlib.h> 161 #include <stdlib.h>
165diff --git a/libasm/asm_end.c b/libasm/asm_end.c 162diff --git a/libasm/asm_end.c b/libasm/asm_end.c
166index ced24f50..4ad918c4 100644 163index ced24f5..4ad918c 100644
167--- a/libasm/asm_end.c 164--- a/libasm/asm_end.c
168+++ b/libasm/asm_end.c 165+++ b/libasm/asm_end.c
169@@ -32,7 +32,7 @@ 166@@ -32,7 +32,7 @@
@@ -176,7 +173,7 @@ index ced24f50..4ad918c4 100644
176 #include <stdio.h> 173 #include <stdio.h>
177 #include <stdlib.h> 174 #include <stdlib.h>
178diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c 175diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c
179index ddbb25df..74a598d9 100644 176index ddbb25d..74a598d 100644
180--- a/libasm/asm_newscn.c 177--- a/libasm/asm_newscn.c
181+++ b/libasm/asm_newscn.c 178+++ b/libasm/asm_newscn.c
182@@ -32,7 +32,7 @@ 179@@ -32,7 +32,7 @@
@@ -189,7 +186,7 @@ index ddbb25df..74a598d9 100644
189 #include <stdlib.h> 186 #include <stdlib.h>
190 #include <string.h> 187 #include <string.h>
191diff --git a/libcpu/i386_gendis.c b/libcpu/i386_gendis.c 188diff --git a/libcpu/i386_gendis.c b/libcpu/i386_gendis.c
192index aae5eae6..6d760165 100644 189index aae5eae..6d76016 100644
193--- a/libcpu/i386_gendis.c 190--- a/libcpu/i386_gendis.c
194+++ b/libcpu/i386_gendis.c 191+++ b/libcpu/i386_gendis.c
195@@ -31,7 +31,7 @@ 192@@ -31,7 +31,7 @@
@@ -202,10 +199,10 @@ index aae5eae6..6d760165 100644
202 #include <stdio.h> 199 #include <stdio.h>
203 #include <stdlib.h> 200 #include <stdlib.h>
204diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c 201diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c
205index ba5f4aa5..b1e41916 100644 202index facdf71..f13842f 100644
206--- a/libcpu/i386_lex.c 203--- a/libcpu/i386_lex.c
207+++ b/libcpu/i386_lex.c 204+++ b/libcpu/i386_lex.c
208@@ -577,7 +577,7 @@ char *i386_text; 205@@ -571,7 +571,7 @@ char *i386_text;
209 #endif 206 #endif
210 207
211 #include <ctype.h> 208 #include <ctype.h>
@@ -215,7 +212,7 @@ index ba5f4aa5..b1e41916 100644
215 212
216 #include <libeu.h> 213 #include <libeu.h>
217diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c 214diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c
218index 6fa7ce3d..bb270061 100644 215index 3c5058a..bf402d6 100644
219--- a/libcpu/i386_parse.c 216--- a/libcpu/i386_parse.c
220+++ b/libcpu/i386_parse.c 217+++ b/libcpu/i386_parse.c
221@@ -107,7 +107,7 @@ 218@@ -107,7 +107,7 @@
@@ -228,10 +225,10 @@ index 6fa7ce3d..bb270061 100644
228 #include <libintl.h> 225 #include <libintl.h>
229 #include <math.h> 226 #include <math.h>
230diff --git a/libdw/Makefile.am b/libdw/Makefile.am 227diff --git a/libdw/Makefile.am b/libdw/Makefile.am
231index ff8c291e..89e792aa 100644 228index 41df4f3..e6b275f 100644
232--- a/libdw/Makefile.am 229--- a/libdw/Makefile.am
233+++ b/libdw/Makefile.am 230+++ b/libdw/Makefile.am
234@@ -105,7 +105,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) 231@@ -107,7 +107,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
235 libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ 232 libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \
236 ../libdwfl/libdwfl_pic.a ../libebl/libebl.a 233 ../libdwfl/libdwfl_pic.a ../libebl/libebl.a
237 libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so 234 libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
@@ -242,7 +239,7 @@ index ff8c291e..89e792aa 100644
242 libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) 239 libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
243 # The rpath is necessary for libebl because its $ORIGIN use will 240 # The rpath is necessary for libebl because its $ORIGIN use will
244diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c 241diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c
245index 28a8cf6e..29aeb3f7 100644 242index d6af23a..deb724c 100644
246--- a/libdw/libdw_alloc.c 243--- a/libdw/libdw_alloc.c
247+++ b/libdw/libdw_alloc.c 244+++ b/libdw/libdw_alloc.c
248@@ -31,7 +31,7 @@ 245@@ -31,7 +31,7 @@
@@ -255,7 +252,7 @@ index 28a8cf6e..29aeb3f7 100644
255 #include <stdlib.h> 252 #include <stdlib.h>
256 #include "libdwP.h" 253 #include "libdwP.h"
257diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c 254diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
258index ee0c1646..b06ab596 100644 255index cc6c3f6..b06ab59 100644
259--- a/libdwfl/dwfl_build_id_find_elf.c 256--- a/libdwfl/dwfl_build_id_find_elf.c
260+++ b/libdwfl/dwfl_build_id_find_elf.c 257+++ b/libdwfl/dwfl_build_id_find_elf.c
261@@ -31,6 +31,7 @@ 258@@ -31,6 +31,7 @@
@@ -266,17 +263,8 @@ index ee0c1646..b06ab596 100644
266 #include <inttypes.h> 263 #include <inttypes.h>
267 #include <fcntl.h> 264 #include <fcntl.h>
268 #include <unistd.h> 265 #include <unistd.h>
269@@ -99,7 +100,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name,
270 {
271 if (*file_name != NULL)
272 free (*file_name);
273- *file_name = canonicalize_file_name (name);
274+ *file_name = realpath (name, NULL);
275 if (*file_name == NULL)
276 {
277 *file_name = name;
278diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c 266diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
279index 7bcf61cc..c345797a 100644 267index 7bcf61c..c345797 100644
280--- a/libdwfl/dwfl_error.c 268--- a/libdwfl/dwfl_error.c
281+++ b/libdwfl/dwfl_error.c 269+++ b/libdwfl/dwfl_error.c
282@@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error) 270@@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error)
@@ -298,7 +286,7 @@ index 7bcf61cc..c345797a 100644
298 return elf_errmsg (error & 0xffff); 286 return elf_errmsg (error & 0xffff);
299 case OTHER_ERROR (LIBDW): 287 case OTHER_ERROR (LIBDW):
300diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c 288diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
301index 9775aced..511c4a6a 100644 289index af6838a..c079d6a 100644
302--- a/libdwfl/dwfl_module_getdwarf.c 290--- a/libdwfl/dwfl_module_getdwarf.c
303+++ b/libdwfl/dwfl_module_getdwarf.c 291+++ b/libdwfl/dwfl_module_getdwarf.c
304@@ -35,6 +35,7 @@ 292@@ -35,6 +35,7 @@
@@ -309,21 +297,8 @@ index 9775aced..511c4a6a 100644
309 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */ 297 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
310 #include "../libelf/libelfP.h" 298 #include "../libelf/libelfP.h"
311 #include "system.h" 299 #include "system.h"
312diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
313index 6d5a42a6..9267788d 100644
314--- a/libdwfl/find-debuginfo.c
315+++ b/libdwfl/find-debuginfo.c
316@@ -389,7 +389,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod,
317 /* If FILE_NAME is a symlink, the debug file might be associated
318 with the symlink target name instead. */
319
320- char *canon = canonicalize_file_name (file_name);
321+ char *canon = realpath (file_name, NULL);
322 if (canon != NULL && strcmp (file_name, canon))
323 fd = find_debuginfo_in_path (mod, canon,
324 debuglink_file, debuglink_crc,
325diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c 300diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
326index f849128d..6f0aca1b 100644 301index f849128..6f0aca1 100644
327--- a/libdwfl/libdwfl_crc32_file.c 302--- a/libdwfl/libdwfl_crc32_file.c
328+++ b/libdwfl/libdwfl_crc32_file.c 303+++ b/libdwfl/libdwfl_crc32_file.c
329@@ -29,6 +29,15 @@ 304@@ -29,6 +29,15 @@
@@ -343,7 +318,7 @@ index f849128d..6f0aca1b 100644
343 #define crc32 __libdwfl_crc32 318 #define crc32 __libdwfl_crc32
344 #include <libdwflP.h> 319 #include <libdwflP.h>
345diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c 320diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
346index 9d0fef2c..9fc09b88 100644 321index 9d0fef2..9fc09b8 100644
347--- a/libdwfl/linux-kernel-modules.c 322--- a/libdwfl/linux-kernel-modules.c
348+++ b/libdwfl/linux-kernel-modules.c 323+++ b/libdwfl/linux-kernel-modules.c
349@@ -40,6 +40,7 @@ 324@@ -40,6 +40,7 @@
@@ -355,7 +330,7 @@ index 9d0fef2c..9fc09b88 100644
355 #include <errno.h> 330 #include <errno.h>
356 #include <stdio.h> 331 #include <stdio.h>
357diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c 332diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
358index 53713963..2e66dfdd 100644 333index 8b063f4..9bdeead 100644
359--- a/libebl/eblopenbackend.c 334--- a/libebl/eblopenbackend.c
360+++ b/libebl/eblopenbackend.c 335+++ b/libebl/eblopenbackend.c
361@@ -32,7 +32,7 @@ 336@@ -32,7 +32,7 @@
@@ -368,7 +343,7 @@ index 53713963..2e66dfdd 100644
368 #include <dwarf.h> 343 #include <dwarf.h>
369 #include <stdlib.h> 344 #include <stdlib.h>
370diff --git a/libelf/elf.h b/libelf/elf.h 345diff --git a/libelf/elf.h b/libelf/elf.h
371index 5cf2b934..990b3afb 100644 346index f774898..be277d0 100644
372--- a/libelf/elf.h 347--- a/libelf/elf.h
373+++ b/libelf/elf.h 348+++ b/libelf/elf.h
374@@ -21,7 +21,9 @@ 349@@ -21,7 +21,9 @@
@@ -382,9 +357,9 @@ index 5cf2b934..990b3afb 100644
382 357
383 /* Standard ELF types. */ 358 /* Standard ELF types. */
384 359
385@@ -3705,6 +3707,8 @@ enum 360@@ -3912,6 +3914,8 @@ enum
386 #define R_BPF_NONE 0 /* No reloc */ 361 #define R_METAG_TLS_LE_HI16 60
387 #define R_BPF_MAP_FD 1 /* Map fd to pointer */ 362 #define R_METAG_TLS_LE_LO16 61
388 363
389-__END_DECLS 364-__END_DECLS
390+#ifdef __cplusplus 365+#ifdef __cplusplus
@@ -393,7 +368,7 @@ index 5cf2b934..990b3afb 100644
393 368
394 #endif /* elf.h */ 369 #endif /* elf.h */
395diff --git a/libelf/libelf.h b/libelf/libelf.h 370diff --git a/libelf/libelf.h b/libelf/libelf.h
396index 547c0f50..dd78799e 100644 371index 547c0f5..dd78799 100644
397--- a/libelf/libelf.h 372--- a/libelf/libelf.h
398+++ b/libelf/libelf.h 373+++ b/libelf/libelf.h
399@@ -29,6 +29,7 @@ 374@@ -29,6 +29,7 @@
@@ -405,7 +380,7 @@ index 547c0f50..dd78799e 100644
405 #include <sys/types.h> 380 #include <sys/types.h>
406 381
407diff --git a/libelf/libelfP.h b/libelf/libelfP.h 382diff --git a/libelf/libelfP.h b/libelf/libelfP.h
408index 7ee6625a..58408997 100644 383index ca805ac..47f25c2 100644
409--- a/libelf/libelfP.h 384--- a/libelf/libelfP.h
410+++ b/libelf/libelfP.h 385+++ b/libelf/libelfP.h
411@@ -32,6 +32,7 @@ 386@@ -32,6 +32,7 @@
@@ -417,7 +392,7 @@ index 7ee6625a..58408997 100644
417 #include <errno.h> 392 #include <errno.h>
418 #include <stdbool.h> 393 #include <stdbool.h>
419diff --git a/src/addr2line.c b/src/addr2line.c 394diff --git a/src/addr2line.c b/src/addr2line.c
420index 444ee52c..9596fa67 100644 395index 5acafa0..a4920b3 100644
421--- a/src/addr2line.c 396--- a/src/addr2line.c
422+++ b/src/addr2line.c 397+++ b/src/addr2line.c
423@@ -23,7 +23,7 @@ 398@@ -23,7 +23,7 @@
@@ -430,7 +405,7 @@ index 444ee52c..9596fa67 100644
430 #include <inttypes.h> 405 #include <inttypes.h>
431 #include <libdwfl.h> 406 #include <libdwfl.h>
432diff --git a/src/ar.c b/src/ar.c 407diff --git a/src/ar.c b/src/ar.c
433index ec32cee5..4efd729c 100644 408index 818115b..2166f1b 100644
434--- a/src/ar.c 409--- a/src/ar.c
435+++ b/src/ar.c 410+++ b/src/ar.c
436@@ -22,7 +22,7 @@ 411@@ -22,7 +22,7 @@
@@ -443,7 +418,7 @@ index ec32cee5..4efd729c 100644
443 #include <gelf.h> 418 #include <gelf.h>
444 #include <libintl.h> 419 #include <libintl.h>
445diff --git a/src/arlib.c b/src/arlib.c 420diff --git a/src/arlib.c b/src/arlib.c
446index e0839aab..1143658f 100644 421index e0839aa..1143658 100644
447--- a/src/arlib.c 422--- a/src/arlib.c
448+++ b/src/arlib.c 423+++ b/src/arlib.c
449@@ -21,7 +21,7 @@ 424@@ -21,7 +21,7 @@
@@ -456,7 +431,7 @@ index e0839aab..1143658f 100644
456 #include <inttypes.h> 431 #include <inttypes.h>
457 #include <libintl.h> 432 #include <libintl.h>
458diff --git a/src/arlib2.c b/src/arlib2.c 433diff --git a/src/arlib2.c b/src/arlib2.c
459index 553fc57b..46443d0e 100644 434index 553fc57..46443d0 100644
460--- a/src/arlib2.c 435--- a/src/arlib2.c
461+++ b/src/arlib2.c 436+++ b/src/arlib2.c
462@@ -20,7 +20,7 @@ 437@@ -20,7 +20,7 @@
@@ -469,7 +444,7 @@ index 553fc57b..46443d0e 100644
469 #include <limits.h> 444 #include <limits.h>
470 #include <string.h> 445 #include <string.h>
471diff --git a/src/elfcmp.c b/src/elfcmp.c 446diff --git a/src/elfcmp.c b/src/elfcmp.c
472index 50464207..cff183fa 100644 447index 5046420..cff183f 100644
473--- a/src/elfcmp.c 448--- a/src/elfcmp.c
474+++ b/src/elfcmp.c 449+++ b/src/elfcmp.c
475@@ -23,7 +23,7 @@ 450@@ -23,7 +23,7 @@
@@ -482,7 +457,7 @@ index 50464207..cff183fa 100644
482 #include <locale.h> 457 #include <locale.h>
483 #include <libintl.h> 458 #include <libintl.h>
484diff --git a/src/elflint.c b/src/elflint.c 459diff --git a/src/elflint.c b/src/elflint.c
485index df1b3a03..67d8d134 100644 460index 0a26d97..e45fb39 100644
486--- a/src/elflint.c 461--- a/src/elflint.c
487+++ b/src/elflint.c 462+++ b/src/elflint.c
488@@ -24,7 +24,7 @@ 463@@ -24,7 +24,7 @@
@@ -495,7 +470,7 @@ index df1b3a03..67d8d134 100644
495 #include <gelf.h> 470 #include <gelf.h>
496 #include <inttypes.h> 471 #include <inttypes.h>
497diff --git a/src/findtextrel.c b/src/findtextrel.c 472diff --git a/src/findtextrel.c b/src/findtextrel.c
498index 8f1e239a..71463af3 100644 473index 8f1e239..71463af 100644
499--- a/src/findtextrel.c 474--- a/src/findtextrel.c
500+++ b/src/findtextrel.c 475+++ b/src/findtextrel.c
501@@ -23,7 +23,7 @@ 476@@ -23,7 +23,7 @@
@@ -508,7 +483,7 @@ index 8f1e239a..71463af3 100644
508 #include <gelf.h> 483 #include <gelf.h>
509 #include <libdw.h> 484 #include <libdw.h>
510diff --git a/src/nm.c b/src/nm.c 485diff --git a/src/nm.c b/src/nm.c
511index 969c6d35..3113c04c 100644 486index 969c6d3..3113c04 100644
512--- a/src/nm.c 487--- a/src/nm.c
513+++ b/src/nm.c 488+++ b/src/nm.c
514@@ -26,7 +26,7 @@ 489@@ -26,7 +26,7 @@
@@ -521,7 +496,7 @@ index 969c6d35..3113c04c 100644
521 #include <gelf.h> 496 #include <gelf.h>
522 #include <inttypes.h> 497 #include <inttypes.h>
523diff --git a/src/objdump.c b/src/objdump.c 498diff --git a/src/objdump.c b/src/objdump.c
524index 0dd9a6aa..9c8bf149 100644 499index 0dd9a6a..9c8bf14 100644
525--- a/src/objdump.c 500--- a/src/objdump.c
526+++ b/src/objdump.c 501+++ b/src/objdump.c
527@@ -21,7 +21,7 @@ 502@@ -21,7 +21,7 @@
@@ -534,7 +509,7 @@ index 0dd9a6aa..9c8bf149 100644
534 #include <inttypes.h> 509 #include <inttypes.h>
535 #include <libintl.h> 510 #include <libintl.h>
536diff --git a/src/ranlib.c b/src/ranlib.c 511diff --git a/src/ranlib.c b/src/ranlib.c
537index cc0ee233..ae851e40 100644 512index cc0ee23..ae851e4 100644
538--- a/src/ranlib.c 513--- a/src/ranlib.c
539+++ b/src/ranlib.c 514+++ b/src/ranlib.c
540@@ -24,7 +24,7 @@ 515@@ -24,7 +24,7 @@
@@ -547,10 +522,10 @@ index cc0ee233..ae851e40 100644
547 #include <gelf.h> 522 #include <gelf.h>
548 #include <libintl.h> 523 #include <libintl.h>
549diff --git a/src/readelf.c b/src/readelf.c 524diff --git a/src/readelf.c b/src/readelf.c
550index 6a27e7e0..4759a965 100644 525index f185897..6623e93 100644
551--- a/src/readelf.c 526--- a/src/readelf.c
552+++ b/src/readelf.c 527+++ b/src/readelf.c
553@@ -25,7 +25,7 @@ 528@@ -24,7 +24,7 @@
554 #include <ctype.h> 529 #include <ctype.h>
555 #include <dwarf.h> 530 #include <dwarf.h>
556 #include <errno.h> 531 #include <errno.h>
@@ -560,7 +535,7 @@ index 6a27e7e0..4759a965 100644
560 #include <gelf.h> 535 #include <gelf.h>
561 #include <inttypes.h> 536 #include <inttypes.h>
562diff --git a/src/size.c b/src/size.c 537diff --git a/src/size.c b/src/size.c
563index ad8dbcbb..fd83be06 100644 538index ad8dbcb..fd83be0 100644
564--- a/src/size.c 539--- a/src/size.c
565+++ b/src/size.c 540+++ b/src/size.c
566@@ -21,7 +21,7 @@ 541@@ -21,7 +21,7 @@
@@ -573,7 +548,7 @@ index ad8dbcbb..fd83be06 100644
573 #include <gelf.h> 548 #include <gelf.h>
574 #include <inttypes.h> 549 #include <inttypes.h>
575diff --git a/src/stack.c b/src/stack.c 550diff --git a/src/stack.c b/src/stack.c
576index 6f2ff69f..6da0243d 100644 551index 52ae3a8..0fda285 100644
577--- a/src/stack.c 552--- a/src/stack.c
578+++ b/src/stack.c 553+++ b/src/stack.c
579@@ -18,7 +18,7 @@ 554@@ -18,7 +18,7 @@
@@ -586,7 +561,7 @@ index 6f2ff69f..6da0243d 100644
586 #include <inttypes.h> 561 #include <inttypes.h>
587 #include <stdio.h> 562 #include <stdio.h>
588diff --git a/src/strings.c b/src/strings.c 563diff --git a/src/strings.c b/src/strings.c
589index 03d0f133..5c311cbd 100644 564index 03d0f13..5c311cb 100644
590--- a/src/strings.c 565--- a/src/strings.c
591+++ b/src/strings.c 566+++ b/src/strings.c
592@@ -25,7 +25,7 @@ 567@@ -25,7 +25,7 @@
@@ -599,7 +574,7 @@ index 03d0f133..5c311cbd 100644
599 #include <gelf.h> 574 #include <gelf.h>
600 #include <inttypes.h> 575 #include <inttypes.h>
601diff --git a/src/strip.c b/src/strip.c 576diff --git a/src/strip.c b/src/strip.c
602index c7830ec6..0d7f148d 100644 577index 773ed54..ff05f46 100644
603--- a/src/strip.c 578--- a/src/strip.c
604+++ b/src/strip.c 579+++ b/src/strip.c
605@@ -24,7 +24,7 @@ 580@@ -24,7 +24,7 @@
@@ -612,7 +587,7 @@ index c7830ec6..0d7f148d 100644
612 #include <fnmatch.h> 587 #include <fnmatch.h>
613 #include <gelf.h> 588 #include <gelf.h>
614diff --git a/src/unstrip.c b/src/unstrip.c 589diff --git a/src/unstrip.c b/src/unstrip.c
615index 50749093..3d4f9525 100644 590index f368e69..5ca83d0 100644
616--- a/src/unstrip.c 591--- a/src/unstrip.c
617+++ b/src/unstrip.c 592+++ b/src/unstrip.c
618@@ -31,7 +31,7 @@ 593@@ -31,7 +31,7 @@
@@ -625,7 +600,7 @@ index 50749093..3d4f9525 100644
625 #include <fnmatch.h> 600 #include <fnmatch.h>
626 #include <libintl.h> 601 #include <libintl.h>
627diff --git a/tests/addrscopes.c b/tests/addrscopes.c 602diff --git a/tests/addrscopes.c b/tests/addrscopes.c
628index 791569f5..54f4311b 100644 603index 791569f..54f4311 100644
629--- a/tests/addrscopes.c 604--- a/tests/addrscopes.c
630+++ b/tests/addrscopes.c 605+++ b/tests/addrscopes.c
631@@ -25,7 +25,7 @@ 606@@ -25,7 +25,7 @@
@@ -638,7 +613,7 @@ index 791569f5..54f4311b 100644
638 613
639 614
640diff --git a/tests/allregs.c b/tests/allregs.c 615diff --git a/tests/allregs.c b/tests/allregs.c
641index 286f7e3c..c9de0897 100644 616index 286f7e3..c9de089 100644
642--- a/tests/allregs.c 617--- a/tests/allregs.c
643+++ b/tests/allregs.c 618+++ b/tests/allregs.c
644@@ -21,7 +21,7 @@ 619@@ -21,7 +21,7 @@
@@ -651,7 +626,7 @@ index 286f7e3c..c9de0897 100644
651 #include <argp.h> 626 #include <argp.h>
652 #include <assert.h> 627 #include <assert.h>
653diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c 628diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c
654index a387d8ff..955c27d1 100644 629index a387d8f..955c27d 100644
655--- a/tests/backtrace-data.c 630--- a/tests/backtrace-data.c
656+++ b/tests/backtrace-data.c 631+++ b/tests/backtrace-data.c
657@@ -27,7 +27,7 @@ 632@@ -27,7 +27,7 @@
@@ -664,10 +639,10 @@ index a387d8ff..955c27d1 100644
664 #include <dwarf.h> 639 #include <dwarf.h>
665 #if defined(__x86_64__) && defined(__linux__) 640 #if defined(__x86_64__) && defined(__linux__)
666diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c 641diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c
667index 2dc8a9a2..24ca7fb0 100644 642index 7ff826c..246650b 100644
668--- a/tests/backtrace-dwarf.c 643--- a/tests/backtrace-dwarf.c
669+++ b/tests/backtrace-dwarf.c 644+++ b/tests/backtrace-dwarf.c
670@@ -22,7 +22,7 @@ 645@@ -21,7 +21,7 @@
671 #include <stdio_ext.h> 646 #include <stdio_ext.h>
672 #include <locale.h> 647 #include <locale.h>
673 #include <errno.h> 648 #include <errno.h>
@@ -675,9 +650,9 @@ index 2dc8a9a2..24ca7fb0 100644
675+#include <err.h> 650+#include <err.h>
676 #include <unistd.h> 651 #include <unistd.h>
677 #include <sys/types.h> 652 #include <sys/types.h>
678 #include <sys/wait.h> 653 #include ELFUTILS_HEADER(dwfl)
679diff --git a/tests/backtrace.c b/tests/backtrace.c 654diff --git a/tests/backtrace.c b/tests/backtrace.c
680index f5dd761f..a93a8f03 100644 655index f5dd761..a93a8f0 100644
681--- a/tests/backtrace.c 656--- a/tests/backtrace.c
682+++ b/tests/backtrace.c 657+++ b/tests/backtrace.c
683@@ -24,7 +24,7 @@ 658@@ -24,7 +24,7 @@
@@ -690,7 +665,7 @@ index f5dd761f..a93a8f03 100644
690 #include <dwarf.h> 665 #include <dwarf.h>
691 #ifdef __linux__ 666 #ifdef __linux__
692diff --git a/tests/buildid.c b/tests/buildid.c 667diff --git a/tests/buildid.c b/tests/buildid.c
693index 87c18773..2953e6bb 100644 668index 87c1877..2953e6b 100644
694--- a/tests/buildid.c 669--- a/tests/buildid.c
695+++ b/tests/buildid.c 670+++ b/tests/buildid.c
696@@ -23,7 +23,7 @@ 671@@ -23,7 +23,7 @@
@@ -703,7 +678,7 @@ index 87c18773..2953e6bb 100644
703 #include <stdlib.h> 678 #include <stdlib.h>
704 #include <sys/types.h> 679 #include <sys/types.h>
705diff --git a/tests/debugaltlink.c b/tests/debugaltlink.c 680diff --git a/tests/debugaltlink.c b/tests/debugaltlink.c
706index 6d97d500..ee7e559e 100644 681index 6d97d50..ee7e559 100644
707--- a/tests/debugaltlink.c 682--- a/tests/debugaltlink.c
708+++ b/tests/debugaltlink.c 683+++ b/tests/debugaltlink.c
709@@ -23,7 +23,7 @@ 684@@ -23,7 +23,7 @@
@@ -716,7 +691,7 @@ index 6d97d500..ee7e559e 100644
716 #include <stdlib.h> 691 #include <stdlib.h>
717 #include <sys/types.h> 692 #include <sys/types.h>
718diff --git a/tests/debuglink.c b/tests/debuglink.c 693diff --git a/tests/debuglink.c b/tests/debuglink.c
719index 935d1029..741cb814 100644 694index 935d102..741cb81 100644
720--- a/tests/debuglink.c 695--- a/tests/debuglink.c
721+++ b/tests/debuglink.c 696+++ b/tests/debuglink.c
722@@ -21,7 +21,7 @@ 697@@ -21,7 +21,7 @@
@@ -729,7 +704,7 @@ index 935d1029..741cb814 100644
729 #include <stdlib.h> 704 #include <stdlib.h>
730 #include <sys/types.h> 705 #include <sys/types.h>
731diff --git a/tests/deleted.c b/tests/deleted.c 706diff --git a/tests/deleted.c b/tests/deleted.c
732index 6be35bc2..01907113 100644 707index 6be35bc..0190711 100644
733--- a/tests/deleted.c 708--- a/tests/deleted.c
734+++ b/tests/deleted.c 709+++ b/tests/deleted.c
735@@ -21,7 +21,7 @@ 710@@ -21,7 +21,7 @@
@@ -742,7 +717,7 @@ index 6be35bc2..01907113 100644
742 #ifdef __linux__ 717 #ifdef __linux__
743 #include <sys/prctl.h> 718 #include <sys/prctl.h>
744diff --git a/tests/dwfl-addr-sect.c b/tests/dwfl-addr-sect.c 719diff --git a/tests/dwfl-addr-sect.c b/tests/dwfl-addr-sect.c
745index 21e470a3..1ea1e3b2 100644 720index 21e470a..1ea1e3b 100644
746--- a/tests/dwfl-addr-sect.c 721--- a/tests/dwfl-addr-sect.c
747+++ b/tests/dwfl-addr-sect.c 722+++ b/tests/dwfl-addr-sect.c
748@@ -23,7 +23,7 @@ 723@@ -23,7 +23,7 @@
@@ -755,7 +730,7 @@ index 21e470a3..1ea1e3b2 100644
755 #include <argp.h> 730 #include <argp.h>
756 #include ELFUTILS_HEADER(dwfl) 731 #include ELFUTILS_HEADER(dwfl)
757diff --git a/tests/dwfl-bug-addr-overflow.c b/tests/dwfl-bug-addr-overflow.c 732diff --git a/tests/dwfl-bug-addr-overflow.c b/tests/dwfl-bug-addr-overflow.c
758index aa8030e1..02c8bef9 100644 733index aa8030e..02c8bef 100644
759--- a/tests/dwfl-bug-addr-overflow.c 734--- a/tests/dwfl-bug-addr-overflow.c
760+++ b/tests/dwfl-bug-addr-overflow.c 735+++ b/tests/dwfl-bug-addr-overflow.c
761@@ -20,7 +20,7 @@ 736@@ -20,7 +20,7 @@
@@ -768,7 +743,7 @@ index aa8030e1..02c8bef9 100644
768 #include ELFUTILS_HEADER(dwfl) 743 #include ELFUTILS_HEADER(dwfl)
769 744
770diff --git a/tests/dwfl-bug-fd-leak.c b/tests/dwfl-bug-fd-leak.c 745diff --git a/tests/dwfl-bug-fd-leak.c b/tests/dwfl-bug-fd-leak.c
771index 689cdd79..5973da39 100644 746index 689cdd7..5973da3 100644
772--- a/tests/dwfl-bug-fd-leak.c 747--- a/tests/dwfl-bug-fd-leak.c
773+++ b/tests/dwfl-bug-fd-leak.c 748+++ b/tests/dwfl-bug-fd-leak.c
774@@ -24,7 +24,7 @@ 749@@ -24,7 +24,7 @@
@@ -781,7 +756,7 @@ index 689cdd79..5973da39 100644
781 #include <dwarf.h> 756 #include <dwarf.h>
782 757
783diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c 758diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c
784index 1ee989f8..fd62e653 100644 759index 1ee989f..fd62e65 100644
785--- a/tests/dwfl-bug-getmodules.c 760--- a/tests/dwfl-bug-getmodules.c
786+++ b/tests/dwfl-bug-getmodules.c 761+++ b/tests/dwfl-bug-getmodules.c
787@@ -18,7 +18,7 @@ 762@@ -18,7 +18,7 @@
@@ -794,7 +769,7 @@ index 1ee989f8..fd62e653 100644
794 static const Dwfl_Callbacks callbacks = 769 static const Dwfl_Callbacks callbacks =
795 { 770 {
796diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c 771diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c
797index a4e97d3c..f471587c 100644 772index a4e97d3..f471587 100644
798--- a/tests/dwfl-report-elf-align.c 773--- a/tests/dwfl-report-elf-align.c
799+++ b/tests/dwfl-report-elf-align.c 774+++ b/tests/dwfl-report-elf-align.c
800@@ -20,7 +20,7 @@ 775@@ -20,7 +20,7 @@
@@ -807,7 +782,7 @@ index a4e97d3c..f471587c 100644
807 #include <string.h> 782 #include <string.h>
808 #include <stdlib.h> 783 #include <stdlib.h>
809diff --git a/tests/dwfllines.c b/tests/dwfllines.c 784diff --git a/tests/dwfllines.c b/tests/dwfllines.c
810index 90379dd2..cbdf6c4c 100644 785index 90379dd..cbdf6c4 100644
811--- a/tests/dwfllines.c 786--- a/tests/dwfllines.c
812+++ b/tests/dwfllines.c 787+++ b/tests/dwfllines.c
813@@ -27,7 +27,7 @@ 788@@ -27,7 +27,7 @@
@@ -820,7 +795,7 @@ index 90379dd2..cbdf6c4c 100644
820 int 795 int
821 main (int argc, char *argv[]) 796 main (int argc, char *argv[])
822diff --git a/tests/dwflmodtest.c b/tests/dwflmodtest.c 797diff --git a/tests/dwflmodtest.c b/tests/dwflmodtest.c
823index 0027f96b..e68d3bca 100644 798index 0027f96..e68d3bc 100644
824--- a/tests/dwflmodtest.c 799--- a/tests/dwflmodtest.c
825+++ b/tests/dwflmodtest.c 800+++ b/tests/dwflmodtest.c
826@@ -23,7 +23,7 @@ 801@@ -23,7 +23,7 @@
@@ -833,7 +808,7 @@ index 0027f96b..e68d3bca 100644
833 #include <argp.h> 808 #include <argp.h>
834 #include ELFUTILS_HEADER(dwfl) 809 #include ELFUTILS_HEADER(dwfl)
835diff --git a/tests/dwflsyms.c b/tests/dwflsyms.c 810diff --git a/tests/dwflsyms.c b/tests/dwflsyms.c
836index 49ac3346..cf078301 100644 811index 49ac334..cf07830 100644
837--- a/tests/dwflsyms.c 812--- a/tests/dwflsyms.c
838+++ b/tests/dwflsyms.c 813+++ b/tests/dwflsyms.c
839@@ -25,7 +25,7 @@ 814@@ -25,7 +25,7 @@
@@ -846,7 +821,7 @@ index 49ac3346..cf078301 100644
846 821
847 static const char * 822 static const char *
848diff --git a/tests/early-offscn.c b/tests/early-offscn.c 823diff --git a/tests/early-offscn.c b/tests/early-offscn.c
849index 924cb9ef..6f60d5a3 100644 824index 924cb9e..6f60d5a 100644
850--- a/tests/early-offscn.c 825--- a/tests/early-offscn.c
851+++ b/tests/early-offscn.c 826+++ b/tests/early-offscn.c
852@@ -19,7 +19,7 @@ 827@@ -19,7 +19,7 @@
@@ -859,7 +834,7 @@ index 924cb9ef..6f60d5a3 100644
859 #include <gelf.h> 834 #include <gelf.h>
860 #include <stdio.h> 835 #include <stdio.h>
861diff --git a/tests/ecp.c b/tests/ecp.c 836diff --git a/tests/ecp.c b/tests/ecp.c
862index 38a6859e..743cea5d 100644 837index 38a6859..743cea5 100644
863--- a/tests/ecp.c 838--- a/tests/ecp.c
864+++ b/tests/ecp.c 839+++ b/tests/ecp.c
865@@ -20,7 +20,7 @@ 840@@ -20,7 +20,7 @@
@@ -872,7 +847,7 @@ index 38a6859e..743cea5d 100644
872 #include <gelf.h> 847 #include <gelf.h>
873 #include <stdlib.h> 848 #include <stdlib.h>
874diff --git a/tests/find-prologues.c b/tests/find-prologues.c 849diff --git a/tests/find-prologues.c b/tests/find-prologues.c
875index ba8ae371..76f5f047 100644 850index ba8ae37..76f5f04 100644
876--- a/tests/find-prologues.c 851--- a/tests/find-prologues.c
877+++ b/tests/find-prologues.c 852+++ b/tests/find-prologues.c
878@@ -25,7 +25,7 @@ 853@@ -25,7 +25,7 @@
@@ -885,7 +860,7 @@ index ba8ae371..76f5f047 100644
885 #include <fnmatch.h> 860 #include <fnmatch.h>
886 861
887diff --git a/tests/funcretval.c b/tests/funcretval.c 862diff --git a/tests/funcretval.c b/tests/funcretval.c
888index 8d19d117..c8aaa93d 100644 863index 8d19d11..c8aaa93 100644
889--- a/tests/funcretval.c 864--- a/tests/funcretval.c
890+++ b/tests/funcretval.c 865+++ b/tests/funcretval.c
891@@ -25,7 +25,7 @@ 866@@ -25,7 +25,7 @@
@@ -898,7 +873,7 @@ index 8d19d117..c8aaa93d 100644
898 #include <fnmatch.h> 873 #include <fnmatch.h>
899 874
900diff --git a/tests/funcscopes.c b/tests/funcscopes.c 875diff --git a/tests/funcscopes.c b/tests/funcscopes.c
901index 9c901858..dbccb89e 100644 876index 9c90185..dbccb89 100644
902--- a/tests/funcscopes.c 877--- a/tests/funcscopes.c
903+++ b/tests/funcscopes.c 878+++ b/tests/funcscopes.c
904@@ -25,7 +25,7 @@ 879@@ -25,7 +25,7 @@
@@ -911,7 +886,7 @@ index 9c901858..dbccb89e 100644
911 #include <fnmatch.h> 886 #include <fnmatch.h>
912 887
913diff --git a/tests/getsrc_die.c b/tests/getsrc_die.c 888diff --git a/tests/getsrc_die.c b/tests/getsrc_die.c
914index 055aede0..9c394dd0 100644 889index 055aede..9c394dd 100644
915--- a/tests/getsrc_die.c 890--- a/tests/getsrc_die.c
916+++ b/tests/getsrc_die.c 891+++ b/tests/getsrc_die.c
917@@ -19,7 +19,7 @@ 892@@ -19,7 +19,7 @@
@@ -924,7 +899,7 @@ index 055aede0..9c394dd0 100644
924 #include <inttypes.h> 899 #include <inttypes.h>
925 #include <libelf.h> 900 #include <libelf.h>
926diff --git a/tests/line2addr.c b/tests/line2addr.c 901diff --git a/tests/line2addr.c b/tests/line2addr.c
927index e0d65d3d..9bf0023b 100644 902index e0d65d3..9bf0023 100644
928--- a/tests/line2addr.c 903--- a/tests/line2addr.c
929+++ b/tests/line2addr.c 904+++ b/tests/line2addr.c
930@@ -26,7 +26,7 @@ 905@@ -26,7 +26,7 @@
@@ -937,7 +912,7 @@ index e0d65d3d..9bf0023b 100644
937 912
938 static void 913 static void
939diff --git a/tests/low_high_pc.c b/tests/low_high_pc.c 914diff --git a/tests/low_high_pc.c b/tests/low_high_pc.c
940index d0f43023..8da4fbdf 100644 915index 5c6b343..fa0c158 100644
941--- a/tests/low_high_pc.c 916--- a/tests/low_high_pc.c
942+++ b/tests/low_high_pc.c 917+++ b/tests/low_high_pc.c
943@@ -25,7 +25,7 @@ 918@@ -25,7 +25,7 @@
@@ -949,21 +924,8 @@ index d0f43023..8da4fbdf 100644
949 #include <string.h> 924 #include <string.h>
950 #include <fnmatch.h> 925 #include <fnmatch.h>
951 926
952diff --git a/tests/md5-sha1-test.c b/tests/md5-sha1-test.c
953index d50355e9..3c41f40b 100644
954--- a/tests/md5-sha1-test.c
955+++ b/tests/md5-sha1-test.c
956@@ -19,7 +19,7 @@
957 #endif
958
959 #include <string.h>
960-#include <error.h>
961+#include <err.h>
962
963 #include "md5.h"
964 #include "sha1.h"
965diff --git a/tests/rdwrmmap.c b/tests/rdwrmmap.c 927diff --git a/tests/rdwrmmap.c b/tests/rdwrmmap.c
966index 6f027dfe..1ce5e6ed 100644 928index 6f027df..1ce5e6e 100644
967--- a/tests/rdwrmmap.c 929--- a/tests/rdwrmmap.c
968+++ b/tests/rdwrmmap.c 930+++ b/tests/rdwrmmap.c
969@@ -19,7 +19,7 @@ 931@@ -19,7 +19,7 @@
@@ -976,7 +938,7 @@ index 6f027dfe..1ce5e6ed 100644
976 #include <fcntl.h> 938 #include <fcntl.h>
977 #include <unistd.h> 939 #include <unistd.h>
978diff --git a/tests/saridx.c b/tests/saridx.c 940diff --git a/tests/saridx.c b/tests/saridx.c
979index 8a450d82..b3878013 100644 941index 8a450d8..b387801 100644
980--- a/tests/saridx.c 942--- a/tests/saridx.c
981+++ b/tests/saridx.c 943+++ b/tests/saridx.c
982@@ -17,7 +17,7 @@ 944@@ -17,7 +17,7 @@
@@ -989,7 +951,7 @@ index 8a450d82..b3878013 100644
989 #include <gelf.h> 951 #include <gelf.h>
990 #include <stdio.h> 952 #include <stdio.h>
991diff --git a/tests/sectiondump.c b/tests/sectiondump.c 953diff --git a/tests/sectiondump.c b/tests/sectiondump.c
992index 3033fedc..8e888db3 100644 954index 3033fed..8e888db 100644
993--- a/tests/sectiondump.c 955--- a/tests/sectiondump.c
994+++ b/tests/sectiondump.c 956+++ b/tests/sectiondump.c
995@@ -18,7 +18,7 @@ 957@@ -18,7 +18,7 @@
@@ -1002,7 +964,7 @@ index 3033fedc..8e888db3 100644
1002 #include <gelf.h> 964 #include <gelf.h>
1003 #include <inttypes.h> 965 #include <inttypes.h>
1004diff --git a/tests/varlocs.c b/tests/varlocs.c 966diff --git a/tests/varlocs.c b/tests/varlocs.c
1005index c3fba89e..e043ea2c 100644 967index f4a711c..1d89a61 100644
1006--- a/tests/varlocs.c 968--- a/tests/varlocs.c
1007+++ b/tests/varlocs.c 969+++ b/tests/varlocs.c
1008@@ -25,7 +25,7 @@ 970@@ -25,7 +25,7 @@
@@ -1015,7 +977,7 @@ index c3fba89e..e043ea2c 100644
1015 #include <sys/types.h> 977 #include <sys/types.h>
1016 #include <sys/stat.h> 978 #include <sys/stat.h>
1017diff --git a/tests/vdsosyms.c b/tests/vdsosyms.c 979diff --git a/tests/vdsosyms.c b/tests/vdsosyms.c
1018index b876c10b..afb28232 100644 980index b876c10..afb2823 100644
1019--- a/tests/vdsosyms.c 981--- a/tests/vdsosyms.c
1020+++ b/tests/vdsosyms.c 982+++ b/tests/vdsosyms.c
1021@@ -18,7 +18,7 @@ 983@@ -18,7 +18,7 @@
@@ -1027,3 +989,6 @@ index b876c10b..afb28232 100644
1027 #include <inttypes.h> 989 #include <inttypes.h>
1028 #include <stdio.h> 990 #include <stdio.h>
1029 #include <string.h> 991 #include <string.h>
992--
9932.7.4
994
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch b/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
index e0291b4cf3..a9a7210031 100644
--- a/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
@@ -8,10 +8,6 @@ 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
15--- 11---
16 backends/mips_init.c | 6 +----- 12 backends/mips_init.c | 6 +-----
17 1 file changed, 1 insertion(+), 5 deletions(-) 13 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff b/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch
index 50f4b059e3..540ba95e0e 100644
--- a/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-arm_backend.patch
@@ -1,8 +1,28 @@
1Upstream-Status: Backport [from debian] 1From a95f370bc2690c150c46f215543de278469900eb Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jun 2018 15:42:39 +0800
4Subject: [PATCH] arm_backend
5
6Upstream-Status: Backport from debian
7arm_backend.diff and rebase to 0.172
8
9http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
10
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 backends/arm_init.c | 18 ++++-
14 backends/arm_regs.c | 132 ++++++++++++++++++++++++++++++++++++
15 backends/arm_retval.c | 43 +++++++++++-
16 backends/libebl_arm.h | 9 +++
17 libelf/elf.h | 11 +++
18 tests/run-addrcfi.sh | 93 ++++++++++++++++++++++++-
19 tests/run-allregs.sh | 95 +++++++++++++++++++++++++-
20 tests/run-readelf-mixed-corenote.sh | 11 ++-
21 8 files changed, 400 insertions(+), 12 deletions(-)
22 create mode 100644 backends/libebl_arm.h
3 23
4Index: b/backends/arm_init.c 24diff --git a/backends/arm_init.c b/backends/arm_init.c
5=================================================================== 25index f2b1b11..1b71f16 100644
6--- a/backends/arm_init.c 26--- a/backends/arm_init.c
7+++ b/backends/arm_init.c 27+++ b/backends/arm_init.c
8@@ -35,20 +35,31 @@ 28@@ -35,20 +35,31 @@
@@ -38,7 +58,7 @@ Index: b/backends/arm_init.c
38 /* We handle it. */ 58 /* We handle it. */
39 eh->name = "ARM"; 59 eh->name = "ARM";
40 arm_init_reloc (eh); 60 arm_init_reloc (eh);
41@@ -60,7 +71,10 @@ arm_init (Elf *elf __attribute__ ((unuse 61@@ -60,7 +71,10 @@ arm_init (Elf *elf __attribute__ ((unused)),
42 HOOK (eh, core_note); 62 HOOK (eh, core_note);
43 HOOK (eh, auxv_info); 63 HOOK (eh, auxv_info);
44 HOOK (eh, check_object_attribute); 64 HOOK (eh, check_object_attribute);
@@ -50,8 +70,8 @@ Index: b/backends/arm_init.c
50 HOOK (eh, abi_cfi); 70 HOOK (eh, abi_cfi);
51 HOOK (eh, check_reloc_target_type); 71 HOOK (eh, check_reloc_target_type);
52 HOOK (eh, symbol_type_name); 72 HOOK (eh, symbol_type_name);
53Index: b/backends/arm_regs.c 73diff --git a/backends/arm_regs.c b/backends/arm_regs.c
54=================================================================== 74index a46a4c9..418c931 100644
55--- a/backends/arm_regs.c 75--- a/backends/arm_regs.c
56+++ b/backends/arm_regs.c 76+++ b/backends/arm_regs.c
57@@ -31,6 +31,7 @@ 77@@ -31,6 +31,7 @@
@@ -62,7 +82,7 @@ Index: b/backends/arm_regs.c
62 #include <dwarf.h> 82 #include <dwarf.h>
63 83
64 #define BACKEND arm_ 84 #define BACKEND arm_
65@@ -76,6 +77,9 @@ arm_register_info (Ebl *ebl __attribute_ 85@@ -76,6 +77,9 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)),
66 break; 86 break;
67 87
68 case 16 + 0 ... 16 + 7: 88 case 16 + 0 ... 16 + 7:
@@ -70,9 +90,9 @@ Index: b/backends/arm_regs.c
70+ * but gcc maps FPA registers here 90+ * but gcc maps FPA registers here
71+ */ 91+ */
72 regno += 96 - 16; 92 regno += 96 - 16;
73 /* Fall through. */ 93 FALLTHROUGH;
74 case 96 + 0 ... 96 + 7: 94 case 96 + 0 ... 96 + 7:
75@@ -87,11 +91,139 @@ arm_register_info (Ebl *ebl __attribute_ 95@@ -87,11 +91,139 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)),
76 namelen = 2; 96 namelen = 2;
77 break; 97 break;
78 98
@@ -212,8 +232,8 @@ Index: b/backends/arm_regs.c
212 *setname = "VFP"; 232 *setname = "VFP";
213 *type = DW_ATE_float; 233 *type = DW_ATE_float;
214 *bits = 64; 234 *bits = 64;
215Index: b/backends/arm_retval.c 235diff --git a/backends/arm_retval.c b/backends/arm_retval.c
216=================================================================== 236index 1c28f01..313e4eb 100644
217--- a/backends/arm_retval.c 237--- a/backends/arm_retval.c
218+++ b/backends/arm_retval.c 238+++ b/backends/arm_retval.c
219@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] = 239@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] =
@@ -242,7 +262,7 @@ Index: b/backends/arm_retval.c
242 { 262 {
243 /* Start with the function's type, and get the DW_AT_type attribute, 263 /* Start with the function's type, and get the DW_AT_type attribute,
244 which is the type of the return value. */ 264 which is the type of the return value. */
245@@ -98,6 +106,21 @@ arm_return_value_location (Dwarf_Die *fu 265@@ -98,6 +106,21 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
246 else 266 else
247 return -1; 267 return -1;
248 } 268 }
@@ -264,7 +284,7 @@ Index: b/backends/arm_retval.c
264 if (size <= 16) 284 if (size <= 16)
265 { 285 {
266 intreg: 286 intreg:
267@@ -106,6 +129,7 @@ arm_return_value_location (Dwarf_Die *fu 287@@ -106,6 +129,7 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
268 } 288 }
269 289
270 aggregate: 290 aggregate:
@@ -272,7 +292,7 @@ Index: b/backends/arm_retval.c
272 *locp = loc_aggregate; 292 *locp = loc_aggregate;
273 return nloc_aggregate; 293 return nloc_aggregate;
274 } 294 }
275@@ -125,3 +149,18 @@ arm_return_value_location (Dwarf_Die *fu 295@@ -125,3 +149,18 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
276 DWARF and might be valid. */ 296 DWARF and might be valid. */
277 return -2; 297 return -2;
278 } 298 }
@@ -291,11 +311,26 @@ Index: b/backends/arm_retval.c
291+ return arm_return_value_location_ (functypedie, locp, 0); 311+ return arm_return_value_location_ (functypedie, locp, 0);
292+} 312+}
293+ 313+
294Index: b/libelf/elf.h 314diff --git a/backends/libebl_arm.h b/backends/libebl_arm.h
295=================================================================== 315new file mode 100644
316index 0000000..c00770c
317--- /dev/null
318+++ b/backends/libebl_arm.h
319@@ -0,0 +1,9 @@
320+#ifndef _LIBEBL_ARM_H
321+#define _LIBEBL_ARM_H 1
322+
323+#include <libdw.h>
324+
325+extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp);
326+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp);
327+
328+#endif
329diff --git a/libelf/elf.h b/libelf/elf.h
330index 6c9f61e..6d82fef 100644
296--- a/libelf/elf.h 331--- a/libelf/elf.h
297+++ b/libelf/elf.h 332+++ b/libelf/elf.h
298@@ -2593,6 +2593,9 @@ enum 333@@ -2692,6 +2692,9 @@ enum
299 #define EF_ARM_EABI_VER4 0x04000000 334 #define EF_ARM_EABI_VER4 0x04000000
300 #define EF_ARM_EABI_VER5 0x05000000 335 #define EF_ARM_EABI_VER5 0x05000000
301 336
@@ -305,7 +340,7 @@ Index: b/libelf/elf.h
305 /* Additional symbol types for Thumb. */ 340 /* Additional symbol types for Thumb. */
306 #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ 341 #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */
307 #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ 342 #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */
308@@ -2610,12 +2613,19 @@ enum 343@@ -2709,12 +2712,19 @@ enum
309 344
310 /* Processor specific values for the Phdr p_type field. */ 345 /* Processor specific values for the Phdr p_type field. */
311 #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ 346 #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */
@@ -325,7 +360,7 @@ Index: b/libelf/elf.h
325 360
326 /* AArch64 relocs. */ 361 /* AArch64 relocs. */
327 362
328@@ -2908,6 +2918,7 @@ enum 363@@ -3007,6 +3017,7 @@ enum
329 TLS block (LDR, STR). */ 364 TLS block (LDR, STR). */
330 #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative 365 #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative
331 to GOT origin (LDR). */ 366 to GOT origin (LDR). */
@@ -333,22 +368,119 @@ Index: b/libelf/elf.h
333 #define R_ARM_ME_TOO 128 /* Obsolete. */ 368 #define R_ARM_ME_TOO 128 /* Obsolete. */
334 #define R_ARM_THM_TLS_DESCSEQ 129 369 #define R_ARM_THM_TLS_DESCSEQ 129
335 #define R_ARM_THM_TLS_DESCSEQ16 129 370 #define R_ARM_THM_TLS_DESCSEQ16 129
336Index: b/backends/libebl_arm.h 371diff --git a/tests/run-addrcfi.sh b/tests/run-addrcfi.sh
337=================================================================== 372index fd89d02..462d7c5 100755
338--- /dev/null 373--- a/tests/run-addrcfi.sh
339+++ b/backends/libebl_arm.h 374+++ b/tests/run-addrcfi.sh
340@@ -0,0 +1,9 @@ 375@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range
341+#ifndef _LIBEBL_ARM_H 376 FPA reg21 (f5): undefined
342+#define _LIBEBL_ARM_H 1 377 FPA reg22 (f6): undefined
343+ 378 FPA reg23 (f7): undefined
344+#include <libdw.h> 379+ VFP reg64 (s0): undefined
345+ 380+ VFP reg65 (s1): undefined
346+extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); 381+ VFP reg66 (s2): undefined
347+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); 382+ VFP reg67 (s3): undefined
348+ 383+ VFP reg68 (s4): undefined
349+#endif 384+ VFP reg69 (s5): undefined
350Index: b/tests/run-allregs.sh 385+ VFP reg70 (s6): undefined
351=================================================================== 386+ VFP reg71 (s7): undefined
387+ VFP reg72 (s8): undefined
388+ VFP reg73 (s9): undefined
389+ VFP reg74 (s10): undefined
390+ VFP reg75 (s11): undefined
391+ VFP reg76 (s12): undefined
392+ VFP reg77 (s13): undefined
393+ VFP reg78 (s14): undefined
394+ VFP reg79 (s15): undefined
395+ VFP reg80 (s16): undefined
396+ VFP reg81 (s17): undefined
397+ VFP reg82 (s18): undefined
398+ VFP reg83 (s19): undefined
399+ VFP reg84 (s20): undefined
400+ VFP reg85 (s21): undefined
401+ VFP reg86 (s22): undefined
402+ VFP reg87 (s23): undefined
403+ VFP reg88 (s24): undefined
404+ VFP reg89 (s25): undefined
405+ VFP reg90 (s26): undefined
406+ VFP reg91 (s27): undefined
407+ VFP reg92 (s28): undefined
408+ VFP reg93 (s29): undefined
409+ VFP reg94 (s30): undefined
410+ VFP reg95 (s31): undefined
411 FPA reg96 (f0): undefined
412 FPA reg97 (f1): undefined
413 FPA reg98 (f2): undefined
414@@ -3562,7 +3594,66 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range
415 FPA reg101 (f5): undefined
416 FPA reg102 (f6): undefined
417 FPA reg103 (f7): undefined
418- integer reg128 (spsr): undefined
419+ MMX reg104 (wcgr0): undefined
420+ MMX reg105 (wcgr1): undefined
421+ MMX reg106 (wcgr2): undefined
422+ MMX reg107 (wcgr3): undefined
423+ MMX reg108 (wcgr4): undefined
424+ MMX reg109 (wcgr5): undefined
425+ MMX reg110 (wcgr6): undefined
426+ MMX reg111 (wcgr7): undefined
427+ MMX reg112 (wr0): undefined
428+ MMX reg113 (wr1): undefined
429+ MMX reg114 (wr2): undefined
430+ MMX reg115 (wr3): undefined
431+ MMX reg116 (wr4): undefined
432+ MMX reg117 (wr5): undefined
433+ MMX reg118 (wr6): undefined
434+ MMX reg119 (wr7): undefined
435+ MMX reg120 (wr8): undefined
436+ MMX reg121 (wr9): undefined
437+ MMX reg122 (wr10): undefined
438+ MMX reg123 (wr11): undefined
439+ MMX reg124 (wr12): undefined
440+ MMX reg125 (wr13): undefined
441+ MMX reg126 (wr14): undefined
442+ MMX reg127 (wr15): undefined
443+ state reg128 (spsr): undefined
444+ state reg129 (spsr_fiq): undefined
445+ state reg130 (spsr_irq): undefined
446+ state reg131 (spsr_abt): undefined
447+ state reg132 (spsr_und): undefined
448+ state reg133 (spsr_svc): undefined
449+ integer reg144 (r8_usr): undefined
450+ integer reg145 (r9_usr): undefined
451+ integer reg146 (r10_usr): undefined
452+ integer reg147 (r11_usr): undefined
453+ integer reg148 (r12_usr): undefined
454+ integer reg149 (r13_usr): undefined
455+ integer reg150 (r14_usr): undefined
456+ integer reg151 (r8_fiq): undefined
457+ integer reg152 (r9_fiq): undefined
458+ integer reg153 (r10_fiq): undefined
459+ integer reg154 (r11_fiq): undefined
460+ integer reg155 (r12_fiq): undefined
461+ integer reg156 (r13_fiq): undefined
462+ integer reg157 (r14_fiq): undefined
463+ integer reg158 (r13_irq): undefined
464+ integer reg159 (r14_irq): undefined
465+ integer reg160 (r13_abt): undefined
466+ integer reg161 (r14_abt): undefined
467+ integer reg162 (r13_und): undefined
468+ integer reg163 (r14_und): undefined
469+ integer reg164 (r13_svc): undefined
470+ integer reg165 (r14_svc): undefined
471+ MMX reg192 (wc0): undefined
472+ MMX reg193 (wc1): undefined
473+ MMX reg194 (wc2): undefined
474+ MMX reg195 (wc3): undefined
475+ MMX reg196 (wc4): undefined
476+ MMX reg197 (wc5): undefined
477+ MMX reg198 (wc6): undefined
478+ MMX reg199 (wc7): undefined
479 VFP reg256 (d0): undefined
480 VFP reg257 (d1): undefined
481 VFP reg258 (d2): undefined
482diff --git a/tests/run-allregs.sh b/tests/run-allregs.sh
483index 7ddd452..a31dba4 100755
352--- a/tests/run-allregs.sh 484--- a/tests/run-allregs.sh
353+++ b/tests/run-allregs.sh 485+++ b/tests/run-allregs.sh
354@@ -2672,7 +2672,28 @@ integer registers: 486@@ -2672,7 +2672,28 @@ integer registers:
@@ -468,11 +600,11 @@ Index: b/tests/run-allregs.sh
468 EOF 600 EOF
469 601
470 # See run-readelf-mixed-corenote.sh for instructions to regenerate 602 # See run-readelf-mixed-corenote.sh for instructions to regenerate
471Index: b/tests/run-readelf-mixed-corenote.sh 603diff --git a/tests/run-readelf-mixed-corenote.sh b/tests/run-readelf-mixed-corenote.sh
472=================================================================== 604index 86171c4..018612f 100755
473--- a/tests/run-readelf-mixed-corenote.sh 605--- a/tests/run-readelf-mixed-corenote.sh
474+++ b/tests/run-readelf-mixed-corenote.sh 606+++ b/tests/run-readelf-mixed-corenote.sh
475@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x27 607@@ -31,12 +31,11 @@ Note segment of 892 bytes at offset 0x274:
476 pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 608 pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063
477 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000 609 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000
478 orig_r0: -1, fpvalid: 1 610 orig_r0: -1, fpvalid: 1
@@ -490,114 +622,6 @@ Index: b/tests/run-readelf-mixed-corenote.sh
490 CORE 124 PRPSINFO 622 CORE 124 PRPSINFO
491 state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500 623 state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500
492 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 624 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063
493Index: b/tests/run-addrcfi.sh 625--
494=================================================================== 6262.7.4
495--- a/tests/run-addrcfi.sh 627
496+++ b/tests/run-addrcfi.sh
497@@ -3554,6 +3554,38 @@ dwarf_cfi_addrframe (.eh_frame): no matc
498 FPA reg21 (f5): undefined
499 FPA reg22 (f6): undefined
500 FPA reg23 (f7): undefined
501+ VFP reg64 (s0): undefined
502+ VFP reg65 (s1): undefined
503+ VFP reg66 (s2): undefined
504+ VFP reg67 (s3): undefined
505+ VFP reg68 (s4): undefined
506+ VFP reg69 (s5): undefined
507+ VFP reg70 (s6): undefined
508+ VFP reg71 (s7): undefined
509+ VFP reg72 (s8): undefined
510+ VFP reg73 (s9): undefined
511+ VFP reg74 (s10): undefined
512+ VFP reg75 (s11): undefined
513+ VFP reg76 (s12): undefined
514+ VFP reg77 (s13): undefined
515+ VFP reg78 (s14): undefined
516+ VFP reg79 (s15): undefined
517+ VFP reg80 (s16): undefined
518+ VFP reg81 (s17): undefined
519+ VFP reg82 (s18): undefined
520+ VFP reg83 (s19): undefined
521+ VFP reg84 (s20): undefined
522+ VFP reg85 (s21): undefined
523+ VFP reg86 (s22): undefined
524+ VFP reg87 (s23): undefined
525+ VFP reg88 (s24): undefined
526+ VFP reg89 (s25): undefined
527+ VFP reg90 (s26): undefined
528+ VFP reg91 (s27): undefined
529+ VFP reg92 (s28): undefined
530+ VFP reg93 (s29): undefined
531+ VFP reg94 (s30): undefined
532+ VFP reg95 (s31): undefined
533 FPA reg96 (f0): undefined
534 FPA reg97 (f1): undefined
535 FPA reg98 (f2): undefined
536@@ -3562,7 +3594,66 @@ dwarf_cfi_addrframe (.eh_frame): no matc
537 FPA reg101 (f5): undefined
538 FPA reg102 (f6): undefined
539 FPA reg103 (f7): undefined
540- integer reg128 (spsr): undefined
541+ MMX reg104 (wcgr0): undefined
542+ MMX reg105 (wcgr1): undefined
543+ MMX reg106 (wcgr2): undefined
544+ MMX reg107 (wcgr3): undefined
545+ MMX reg108 (wcgr4): undefined
546+ MMX reg109 (wcgr5): undefined
547+ MMX reg110 (wcgr6): undefined
548+ MMX reg111 (wcgr7): undefined
549+ MMX reg112 (wr0): undefined
550+ MMX reg113 (wr1): undefined
551+ MMX reg114 (wr2): undefined
552+ MMX reg115 (wr3): undefined
553+ MMX reg116 (wr4): undefined
554+ MMX reg117 (wr5): undefined
555+ MMX reg118 (wr6): undefined
556+ MMX reg119 (wr7): undefined
557+ MMX reg120 (wr8): undefined
558+ MMX reg121 (wr9): undefined
559+ MMX reg122 (wr10): undefined
560+ MMX reg123 (wr11): undefined
561+ MMX reg124 (wr12): undefined
562+ MMX reg125 (wr13): undefined
563+ MMX reg126 (wr14): undefined
564+ MMX reg127 (wr15): undefined
565+ state reg128 (spsr): undefined
566+ state reg129 (spsr_fiq): undefined
567+ state reg130 (spsr_irq): undefined
568+ state reg131 (spsr_abt): undefined
569+ state reg132 (spsr_und): undefined
570+ state reg133 (spsr_svc): undefined
571+ integer reg144 (r8_usr): undefined
572+ integer reg145 (r9_usr): undefined
573+ integer reg146 (r10_usr): undefined
574+ integer reg147 (r11_usr): undefined
575+ integer reg148 (r12_usr): undefined
576+ integer reg149 (r13_usr): undefined
577+ integer reg150 (r14_usr): undefined
578+ integer reg151 (r8_fiq): undefined
579+ integer reg152 (r9_fiq): undefined
580+ integer reg153 (r10_fiq): undefined
581+ integer reg154 (r11_fiq): undefined
582+ integer reg155 (r12_fiq): undefined
583+ integer reg156 (r13_fiq): undefined
584+ integer reg157 (r14_fiq): undefined
585+ integer reg158 (r13_irq): undefined
586+ integer reg159 (r14_irq): undefined
587+ integer reg160 (r13_abt): undefined
588+ integer reg161 (r14_abt): undefined
589+ integer reg162 (r13_und): undefined
590+ integer reg163 (r14_und): undefined
591+ integer reg164 (r13_svc): undefined
592+ integer reg165 (r14_svc): undefined
593+ MMX reg192 (wc0): undefined
594+ MMX reg193 (wc1): undefined
595+ MMX reg194 (wc2): undefined
596+ MMX reg195 (wc3): undefined
597+ MMX reg196 (wc4): undefined
598+ MMX reg197 (wc5): undefined
599+ MMX reg198 (wc6): undefined
600+ MMX reg199 (wc7): undefined
601 VFP reg256 (d0): undefined
602 VFP reg257 (d1): undefined
603 VFP reg258 (d2): undefined
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch b/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch
new file mode 100644
index 0000000000..66de238418
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch
@@ -0,0 +1,35 @@
1From 5d45565e71ddab3d7848077b61eb0ca73c0bcbcc Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jun 2018 16:01:14 +0800
4Subject: [PATCH] disable -Werror as it tends to break with new gcc versions
5
6Bug-Debian: https://bugs.debian.org/886004
7Last-Update: 2018-01-01
8
9Signed-off-by: Helmut Grohne <helmut@subdivi.de>
10
11Upstream-Status: Backport from debian
12mdisable_werror.patc and rebase to 0.172
13
14http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 config/eu.am | 1 -
19 1 file changed, 1 deletion(-)
20
21diff --git a/config/eu.am b/config/eu.am
22index c2cc349..99b368e 100644
23--- a/config/eu.am
24+++ b/config/eu.am
25@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
26 -Wold-style-definition -Wstrict-prototypes \
27 $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
28 $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
29- $(if $($(*F)_no_Werror),,-Werror) \
30 $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
31 $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
32 $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
33--
342.7.4
35
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch b/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch
new file mode 100644
index 0000000000..226ec7f530
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch
@@ -0,0 +1,57 @@
1From 91c0a0da2a8932f163d57db5d9d847bed6822502 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jun 2018 15:59:57 +0800
4Subject: [PATCH] fix gcc7 ftbfs
5
6Upstream-Status: Backport from debian
7fix-gcc7-ftbfs.diff and rebase to 0.172
8
9http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 backends/mips_retval.c | 1 +
14 backends/parisc_retval.c | 1 +
15 src/ar.c | 2 +-
16 3 files changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/backends/mips_retval.c b/backends/mips_retval.c
19index 57487bb..e7973a8 100644
20--- a/backends/mips_retval.c
21+++ b/backends/mips_retval.c
22@@ -390,6 +390,7 @@ mips_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp)
23 }
24
25 /* Fallthrough to handle large types */
26+ /* Fall through. */
27
28 case DW_TAG_array_type:
29 large:
30diff --git a/backends/parisc_retval.c b/backends/parisc_retval.c
31index df7ec3a..988e1fe 100644
32--- a/backends/parisc_retval.c
33+++ b/backends/parisc_retval.c
34@@ -167,6 +167,7 @@ parisc_return_value_location_ (Dwarf_Die *functypedie, const Dwarf_Op **locp, in
35
36 /* Else fall through. */
37 }
38+ /* Fall through. */
39
40 case DW_TAG_structure_type:
41 case DW_TAG_class_type:
42diff --git a/src/ar.c b/src/ar.c
43index 818115b..c77e9f4 100644
44--- a/src/ar.c
45+++ b/src/ar.c
46@@ -1073,7 +1073,7 @@ do_oper_delete (const char *arfname, char **argv, int argc,
47 static bool
48 no0print (bool ofmt, char *buf, int bufsize, long int val)
49 {
50- char tmpbuf[bufsize + 1];
51+ char tmpbuf[bufsize + 1 + 4];
52 int ret = snprintf (tmpbuf, sizeof (tmpbuf), ofmt ? "%-*lo" : "%-*ld",
53 bufsize, val);
54 if (ret >= (int) sizeof (tmpbuf))
55--
562.7.4
57
diff --git a/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff b/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch
index 56f852a414..c0dbed798d 100644
--- a/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-hppa_backend.patch
@@ -1,10 +1,84 @@
1Upstream-Status: Backport [from debian] 1From c510c6c8523246dd79c6ea28d1646b153c23e491 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jun 2018 15:39:46 +0800
4Subject: [PATCH] hppa_backend
5
6Upstream-Status: Backport from debian
7hppa_backend.diff and rebase to 0.172
8
9http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
2Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 backends/Makefile.am | 9 +-
13 backends/libebl_parisc.h | 9 ++
14 backends/parisc_init.c | 73 ++++++++++++++++
15 backends/parisc_regs.c | 159 ++++++++++++++++++++++++++++++++++
16 backends/parisc_reloc.def | 128 ++++++++++++++++++++++++++++
17 backends/parisc_retval.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++
18 backends/parisc_symbol.c | 112 ++++++++++++++++++++++++
19 libelf/elf.h | 11 +++
20 8 files changed, 711 insertions(+), 3 deletions(-)
21 create mode 100644 backends/libebl_parisc.h
22 create mode 100644 backends/parisc_init.c
23 create mode 100644 backends/parisc_regs.c
24 create mode 100644 backends/parisc_reloc.def
25 create mode 100644 backends/parisc_retval.c
26 create mode 100644 backends/parisc_symbol.c
3 27
4Index: elfutils-0.170/backends/parisc_init.c 28diff --git a/backends/Makefile.am b/backends/Makefile.am
5=================================================================== 29index 80aa00e..1e4b8e9 100644
30--- a/backends/Makefile.am
31+++ b/backends/Makefile.am
32@@ -33,16 +33,16 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
33
34
35 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
36- tilegx m68k bpf riscv
37+ tilegx m68k bpf riscv parisc
38 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
39 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
40 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
41 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
42- libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a
43+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \
44+ libebl_parisc_pic.a
45 noinst_LIBRARIES = $(libebl_pic)
46 noinst_DATA = $(libebl_pic:_pic.a=.so)
47
48-
49 libelf = ../libelf/libelf.so
50 libdw = ../libdw/libdw.so
51 libeu = ../lib/libeu.a
52@@ -135,6 +135,9 @@ riscv_SRCS = riscv_init.c riscv_symbol.c
53 libebl_riscv_pic_a_SOURCES = $(riscv_SRCS)
54 am_libebl_riscv_pic_a_OBJECTS = $(riscv_SRCS:.c=.os)
55
56+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c
57+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
58+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
59
60 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu)
61 @rm -f $(@:.so=.map)
62diff --git a/backends/libebl_parisc.h b/backends/libebl_parisc.h
63new file mode 100644
64index 0000000..f473b79
65--- /dev/null
66+++ b/backends/libebl_parisc.h
67@@ -0,0 +1,9 @@
68+#ifndef _LIBEBL_HPPA_H
69+#define _LIBEBL_HPPA_H 1
70+
71+#include <libdw.h>
72+
73+extern int parisc_return_value_location_32(Dwarf_Die *, const Dwarf_Op **locp);
74+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp);
75+
76+#endif
77diff --git a/backends/parisc_init.c b/backends/parisc_init.c
78new file mode 100644
79index 0000000..f1e401c
6--- /dev/null 80--- /dev/null
7+++ elfutils-0.170/backends/parisc_init.c 81+++ b/backends/parisc_init.c
8@@ -0,0 +1,73 @@ 82@@ -0,0 +1,73 @@
9+/* Initialization of PA-RISC specific backend library. 83+/* Initialization of PA-RISC specific backend library.
10+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc. 84+ Copyright (C) 2002, 2005, 2006 Red Hat, Inc.
@@ -79,10 +153,11 @@ Index: elfutils-0.170/backends/parisc_init.c
79+ 153+
80+ return MODVERSION; 154+ return MODVERSION;
81+} 155+}
82Index: elfutils-0.170/backends/parisc_regs.c 156diff --git a/backends/parisc_regs.c b/backends/parisc_regs.c
83=================================================================== 157new file mode 100644
158index 0000000..3895f8e
84--- /dev/null 159--- /dev/null
85+++ elfutils-0.170/backends/parisc_regs.c 160+++ b/backends/parisc_regs.c
86@@ -0,0 +1,159 @@ 161@@ -0,0 +1,159 @@
87+/* Register names and numbers for PA-RISC DWARF. 162+/* Register names and numbers for PA-RISC DWARF.
88+ Copyright (C) 2005, 2006 Red Hat, Inc. 163+ Copyright (C) 2005, 2006 Red Hat, Inc.
@@ -243,10 +318,11 @@ Index: elfutils-0.170/backends/parisc_regs.c
243+ name[namelen++] = '\0'; 318+ name[namelen++] = '\0';
244+ return namelen; 319+ return namelen;
245+} 320+}
246Index: elfutils-0.170/backends/parisc_reloc.def 321diff --git a/backends/parisc_reloc.def b/backends/parisc_reloc.def
247=================================================================== 322new file mode 100644
323index 0000000..1f875ba
248--- /dev/null 324--- /dev/null
249+++ elfutils-0.170/backends/parisc_reloc.def 325+++ b/backends/parisc_reloc.def
250@@ -0,0 +1,128 @@ 326@@ -0,0 +1,128 @@
251+/* List the relocation types for PA-RISC. -*- C -*- 327+/* List the relocation types for PA-RISC. -*- C -*-
252+ Copyright (C) 2005 Red Hat, Inc. 328+ Copyright (C) 2005 Red Hat, Inc.
@@ -376,10 +452,11 @@ Index: elfutils-0.170/backends/parisc_reloc.def
376+RELOC_TYPE (TLS_DTPMOD64, DYN) 452+RELOC_TYPE (TLS_DTPMOD64, DYN)
377+ 453+
378+#define NO_RELATIVE_RELOC 1 454+#define NO_RELATIVE_RELOC 1
379Index: elfutils-0.170/backends/parisc_retval.c 455diff --git a/backends/parisc_retval.c b/backends/parisc_retval.c
380=================================================================== 456new file mode 100644
457index 0000000..df7ec3a
381--- /dev/null 458--- /dev/null
382+++ elfutils-0.170/backends/parisc_retval.c 459+++ b/backends/parisc_retval.c
383@@ -0,0 +1,213 @@ 460@@ -0,0 +1,213 @@
384+/* Function return value location for Linux/PA-RISC ABI. 461+/* Function return value location for Linux/PA-RISC ABI.
385+ Copyright (C) 2005 Red Hat, Inc. 462+ Copyright (C) 2005 Red Hat, Inc.
@@ -594,10 +671,11 @@ Index: elfutils-0.170/backends/parisc_retval.c
594+ return parisc_return_value_location_ (functypedie, locp, 1); 671+ return parisc_return_value_location_ (functypedie, locp, 1);
595+} 672+}
596+ 673+
597Index: elfutils-0.170/backends/parisc_symbol.c 674diff --git a/backends/parisc_symbol.c b/backends/parisc_symbol.c
598=================================================================== 675new file mode 100644
676index 0000000..d111a76
599--- /dev/null 677--- /dev/null
600+++ elfutils-0.170/backends/parisc_symbol.c 678+++ b/backends/parisc_symbol.c
601@@ -0,0 +1,112 @@ 679@@ -0,0 +1,112 @@
602+/* PA-RISC specific symbolic name handling. 680+/* PA-RISC specific symbolic name handling.
603+ Copyright (C) 2002, 2005 Red Hat, Inc. 681+ Copyright (C) 2002, 2005 Red Hat, Inc.
@@ -711,54 +789,11 @@ Index: elfutils-0.170/backends/parisc_symbol.c
711+ return ELF_T_NUM; 789+ return ELF_T_NUM;
712+ } 790+ }
713+} 791+}
714Index: elfutils-0.170/backends/libebl_parisc.h 792diff --git a/libelf/elf.h b/libelf/elf.h
715=================================================================== 793index f774898..6c9f61e 100644
716--- /dev/null 794--- a/libelf/elf.h
717+++ elfutils-0.170/backends/libebl_parisc.h 795+++ b/libelf/elf.h
718@@ -0,0 +1,9 @@ 796@@ -2153,16 +2153,24 @@ enum
719+#ifndef _LIBEBL_HPPA_H
720+#define _LIBEBL_HPPA_H 1
721+
722+#include <libdw.h>
723+
724+extern int parisc_return_value_location_32(Dwarf_Die *, const Dwarf_Op **locp);
725+extern int parisc_return_value_location_64(Dwarf_Die *, const Dwarf_Op **locp);
726+
727+#endif
728Index: elfutils-0.170/backends/Makefile.am
729===================================================================
730--- elfutils-0.170.orig/backends/Makefile.am
731+++ elfutils-0.170/backends/Makefile.am
732@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
733
734
735 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
736- tilegx m68k bpf
737+ tilegx m68k bpf parisc
738 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
739 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
740 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
741 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
742- libebl_m68k_pic.a libebl_bpf_pic.a
743+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a
744 noinst_LIBRARIES = $(libebl_pic)
745 noinst_DATA = $(libebl_pic:_pic.a=.so)
746
747@@ -124,6 +124,9 @@ cpu_bpf = ../libcpu/libcpu_bpf.a
748 libebl_bpf_pic_a_SOURCES = $(bpf_SRCS)
749 am_libebl_bpf_pic_a_OBJECTS = $(bpf_SRCS:.c=.os)
750
751+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c
752+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
753+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
754
755 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu)
756 @rm -f $(@:.so=.map)
757Index: elfutils-0.170/libelf/elf.h
758===================================================================
759--- elfutils-0.170.orig/libelf/elf.h
760+++ elfutils-0.170/libelf/elf.h
761@@ -2056,16 +2056,24 @@ enum
762 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */ 797 #define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
763 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */ 798 #define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
764 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */ 799 #define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
@@ -783,7 +818,7 @@ Index: elfutils-0.170/libelf/elf.h
783 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */ 818 #define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
784 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */ 819 #define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
785 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ 820 #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
786@@ -2074,6 +2082,7 @@ enum 821@@ -2171,6 +2179,7 @@ enum
787 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */ 822 #define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address. */
788 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */ 823 #define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address. */
789 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ 824 #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
@@ -791,7 +826,7 @@ Index: elfutils-0.170/libelf/elf.h
791 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ 826 #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
792 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ 827 #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
793 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */ 828 #define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
794@@ -2099,6 +2108,8 @@ enum 829@@ -2196,6 +2205,8 @@ enum
795 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */ 830 #define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
796 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */ 831 #define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
797 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */ 832 #define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
@@ -800,3 +835,6 @@ Index: elfutils-0.170/libelf/elf.h
800 #define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */ 835 #define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */
801 #define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */ 836 #define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */
802 #define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */ 837 #define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */
838--
8392.7.4
840
diff --git a/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch b/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch
index 2e0e54b0c7..3004e19828 100644
--- a/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-mips_backend.patch
@@ -1,11 +1,13 @@
1From 46d0d0ca718093486eeeedf1b44134e9e29b56f7 Mon Sep 17 00:00:00 2001 1From 59ffb86bda845a68d3686afa7bc784131df678f7 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 09:18:59 +0800 3Date: Fri, 29 Jun 2018 15:45:58 +0800
4Subject: [PATCH] mips backends 4Subject: [PATCH] mips_backend
5 5
6Upstream-Status: Backport [from debian] 6Upstream-Status: Backport from debian
7mips_backend.diff and rebase to 0.172
8
9http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
7 10
8Rebase to 0.170
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10--- 12---
11 backends/Makefile.am | 8 +- 13 backends/Makefile.am | 8 +-
@@ -23,25 +25,26 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
23 create mode 100644 backends/mips_symbol.c 25 create mode 100644 backends/mips_symbol.c
24 26
25diff --git a/backends/Makefile.am b/backends/Makefile.am 27diff --git a/backends/Makefile.am b/backends/Makefile.am
26index 7f1f5d4..91baf6e 100644 28index 1e4b8e9..e7bccf8 100644
27--- a/backends/Makefile.am 29--- a/backends/Makefile.am
28+++ b/backends/Makefile.am 30+++ b/backends/Makefile.am
29@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ 31@@ -33,13 +33,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
30 32
31 33
32 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \ 34 modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
33- tilegx m68k bpf parisc 35- tilegx m68k bpf riscv parisc
34+ tilegx m68k bpf parisc mips 36+ tilegx m68k bpf riscv parisc mips
35 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ 37 libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
36 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ 38 libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
37 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \ 39 libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
38 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \ 40 libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
39- libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a 41 libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a \
40+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a libebl_mips_pic.a 42- libebl_parisc_pic.a
43+ libebl_parisc_pic.a libebl_mips_pic.a
41 noinst_LIBRARIES = $(libebl_pic) 44 noinst_LIBRARIES = $(libebl_pic)
42 noinst_DATA = $(libebl_pic:_pic.a=.so) 45 noinst_DATA = $(libebl_pic:_pic.a=.so)
43 46
44@@ -128,6 +128,10 @@ parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c 47@@ -139,6 +139,10 @@ parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c
45 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) 48 libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
46 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) 49 am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
47 50
@@ -698,7 +701,7 @@ index 0000000..ba465fe
698+ } 701+ }
699+} 702+}
700diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c 703diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
701index 1f81477..5371396 100644 704index 8b063f4..5405b0c 100644
702--- a/libebl/eblopenbackend.c 705--- a/libebl/eblopenbackend.c
703+++ b/libebl/eblopenbackend.c 706+++ b/libebl/eblopenbackend.c
704@@ -72,6 +72,8 @@ static const struct 707@@ -72,6 +72,8 @@ static const struct
@@ -711,5 +714,5 @@ index 1f81477..5371396 100644
711 { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 }, 714 { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 },
712 { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB }, 715 { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
713-- 716--
7141.8.3.1 7172.7.4
715 718
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch b/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch
new file mode 100644
index 0000000000..294944ea54
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-mips_readelf_w.patch
@@ -0,0 +1,39 @@
1From a188ea1ada6b990b72b91266ae02da058dcd9523 Mon Sep 17 00:00:00 2001
2From: Kurt Roeckx <kurt@roeckx.be>
3Date: Fri, 29 Jun 2018 15:49:32 +0800
4Subject: [PATCH] Make readelf -w output debug information on mips
5
6Bug-Debian: http://bugs.debian.org/662041
7Forwarded: not-needed
8
9Upstreams wants a change where this is handled by a hook that needs
10to be filled in by the backend for the arch.
11
12Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
13
14Upstream-Status: Backport from debian
15mips_readelf_w.patch and rebase to 0.172
16
17http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.170-0.5.debian.tar.xz
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19---
20 src/readelf.c | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-)
22
23diff --git a/src/readelf.c b/src/readelf.c
24index f185897..0db197c 100644
25--- a/src/readelf.c
26+++ b/src/readelf.c
27@@ -10979,7 +10979,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl *ebl, GElf_Ehdr *ehdr)
28 GElf_Shdr shdr_mem;
29 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
30
31- if (shdr != NULL && shdr->sh_type == SHT_PROGBITS)
32+ if (shdr != NULL && (
33+ (shdr->sh_type == SHT_PROGBITS) || (shdr->sh_type == SHT_MIPS_DWARF)))
34 {
35 static const struct
36 {
37--
382.7.4
39
diff --git a/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch b/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch
new file mode 100644
index 0000000000..14f6909378
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch
@@ -0,0 +1,57 @@
1From fe7613a3b9f2443cc11917826348d4521f267c96 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jun 2018 15:48:33 +0800
4Subject: [PATCH] testsuite ignore elflint
5
6On many architectures this test fails because binaries/libs produced by
7binutils don't pass elflint. However elfutils shouldn't FTBFS because of this.
8
9So we run the tests on all archs to see what breaks, but if it breaks we ignore
10the result (exitcode 77 means: this test was skipped).
11
12Upstream-Status: Backport from debian
13testsuite-ignore-elflint.diff and rebase to 0.172
14
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 tests/run-elflint-self.sh | 2 +-
18 tests/test-subr.sh | 15 +++++++++++++++
19 2 files changed, 16 insertions(+), 1 deletion(-)
20
21diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
22index 58fa7d0..85d21a5 100755
23--- a/tests/run-elflint-self.sh
24+++ b/tests/run-elflint-self.sh
25@@ -18,5 +18,5 @@
26
27 . $srcdir/test-subr.sh
28
29-testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld
30+testrun_on_self_skip ${abs_top_builddir}/src/elflint --quiet --gnu-ld
31 testrun_on_self_compressed ${abs_top_builddir}/src/elflint --quiet --gnu-ld
32diff --git a/tests/test-subr.sh b/tests/test-subr.sh
33index 09f428d..26f61f1 100644
34--- a/tests/test-subr.sh
35+++ b/tests/test-subr.sh
36@@ -201,3 +201,18 @@ testrun_on_self_quiet()
37 # Only exit if something failed
38 if test $exit_status != 0; then exit $exit_status; fi
39 }
40+
41+# Same as testrun_on_self(), but skip on failure.
42+testrun_on_self_skip()
43+{
44+ exit_status=0
45+
46+ for file in $self_test_files; do
47+ testrun $* $file \
48+ || { echo "*** failure in $* $file"; exit_status=77; }
49+ done
50+
51+ # Only exit if something failed
52+ if test $exit_status != 0; then exit $exit_status; fi
53+}
54+
55--
562.7.4
57
diff --git a/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
index b17498f5fa..72125c9ff0 100644
--- a/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
+++ b/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
@@ -4,9 +4,6 @@ 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>
10--- 7---
11 backends/mips_retval.c | 104 ++++++++++++++++++++++++++++++++++++++++++++----- 8 backends/mips_retval.c | 104 ++++++++++++++++++++++++++++++++++++++++++++-----
12 1 file changed, 94 insertions(+), 10 deletions(-) 9 1 file changed, 94 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch b/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
index 2a5f8628d9..6c0ae37fea 100644
--- a/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
+++ b/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
@@ -12,9 +12,6 @@ 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>
18--- 15---
19 libelf/gelf_getrel.c | 25 +++++++++++++++++++++++-- 16 libelf/gelf_getrel.c | 25 +++++++++++++++++++++++--
20 libelf/gelf_getrela.c | 25 +++++++++++++++++++++++-- 17 libelf/gelf_getrela.c | 25 +++++++++++++++++++++++--
@@ -203,7 +200,7 @@ Index: b/src/strip.c
203=================================================================== 200===================================================================
204--- a/src/strip.c 201--- a/src/strip.c
205+++ b/src/strip.c 202+++ b/src/strip.c
206@@ -532,6 +532,23 @@ handle_elf (int fd, Elf *elf, const char 203@@ -598,6 +598,23 @@ handle_elf (int fd, Elf *elf, const char
207 goto fail; 204 goto fail;
208 } 205 }
209 206
diff --git a/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch b/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
new file mode 100644
index 0000000000..4440e39e0a
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
@@ -0,0 +1,14 @@
1Index: elfutils-0.165/tests/run-native-test.sh
2===================================================================
3--- elfutils-0.165.orig/tests/run-native-test.sh
4+++ elfutils-0.165/tests/run-native-test.sh
5@@ -83,6 +83,9 @@ native_test()
6 # "cannot attach to process: Function not implemented".
7 [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77
8
9+# hurd's /proc/$PID/maps does not give paths yet.
10+[ "$(uname)" = "GNU" ] && exit 77
11+
12 native_test ${abs_builddir}/allregs
13 native_test ${abs_builddir}/funcretval
14
diff --git a/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
new file mode 100644
index 0000000000..1e6d7a2de6
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
@@ -0,0 +1,11 @@
1--- elfutils-0.165.orig/tests/run-strip-strmerge.sh
2+++ elfutils-0.165/tests/run-strip-strmerge.sh
3@@ -30,7 +30,7 @@ remerged=remerged.elf
4 tempfiles $merged $stripped $debugfile $remerged
5
6 echo elflint $input
7-testrun ${abs_top_builddir}/src/elflint --gnu $input
8+testrun_on_self_skip ${abs_top_builddir}/src/elflint --gnu $input
9 echo elfstrmerge
10 testrun ${abs_top_builddir}/tests/elfstrmerge -o $merged $input
11 echo elflint $merged
diff --git a/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch b/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
new file mode 100644
index 0000000000..9a19b58b50
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
@@ -0,0 +1,17 @@
1Index: b/tests/run-native-test.sh
2===================================================================
3--- a/tests/run-native-test.sh
4+++ b/tests/run-native-test.sh
5@@ -77,6 +77,12 @@ native_test()
6 test $native -eq 0 || testrun "$@" -p $native > /dev/null
7 }
8
9+# On the Debian buildds, GNU/kFreeBSD linprocfs /proc/$PID/maps does
10+# not give absolute paths due to sbuild's bind mounts (bug #570805)
11+# therefore the next two test programs are expected to fail with
12+# "cannot attach to process: Function not implemented".
13+[ "$(uname)" = "GNU/kFreeBSD" ] && exit 77
14+
15 native_test ${abs_builddir}/allregs
16 native_test ${abs_builddir}/funcretval
17
diff --git a/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
deleted file mode 100644
index 790930cf35..0000000000
--- a/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From: Kurt Roeckx <kurt@roeckx.be>
2Subject: Make readelf -w output debug information on mips
3Bug-Debian: http://bugs.debian.org/662041
4Forwarded: not-needed
5
6Upstreams wants a change where this is handled by a hook that needs
7to be filled in by the backend for the arch.
8
9Upstream-Status: Backport [from debian]
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11
12Index: b/src/readelf.c
13===================================================================
14--- a/src/readelf.c
15+++ b/src/readelf.c
16@@ -8343,7 +8343,8 @@ print_debug (Dwfl_Module *dwflmod, Ebl *
17 GElf_Shdr shdr_mem;
18 GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
19
20- if (shdr != NULL && shdr->sh_type == SHT_PROGBITS)
21+ if (shdr != NULL && (
22+ (shdr->sh_type == SHT_PROGBITS) || (shdr->sh_type == SHT_MIPS_DWARF)))
23 {
24 static const struct
25 {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-11 23:10:48 +0000