diff options
Diffstat (limited to 'poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch')
| -rw-r--r-- | poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch | 873 |
1 files changed, 35 insertions, 838 deletions
diff --git a/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch index a42ce7b35..0f01a3218 100644 --- a/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch +++ b/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch @@ -1,90 +1,32 @@ -From ef0981744669149a00dd0439a54dac30de7b56a7 Mon Sep 17 00:00:00 2001 +From 207be05c44da5c4c31179a34660e176145ff8d4b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 16 Aug 2017 10:06:26 +0800 +Date: Mon, 2 Jul 2018 09:52:23 +0800 Subject: [PATCH] build: Provide alternatives for glibc assumptions helps compiling it on musl Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Rebase to 0.170 +Rebase to 0.174 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - --- Makefile.am | 2 +- - lib/color.c | 3 ++- lib/fixedsizehash.h | 1 - - lib/system.h | 10 ++++++++++ - lib/xmalloc.c | 2 +- - libasm/asm_end.c | 2 +- - libasm/asm_newscn.c | 2 +- - libcpu/i386_gendis.c | 2 +- - libcpu/i386_lex.c | 2 +- - libcpu/i386_parse.c | 2 +- + lib/system.h | 12 +++++++++++- libdw/Makefile.am | 3 ++- - libdw/libdw_alloc.c | 2 +- - libdwfl/dwfl_build_id_find_elf.c | 3 ++- + libdwfl/dwfl_build_id_find_elf.c | 1 + libdwfl/dwfl_error.c | 4 +++- libdwfl/dwfl_module_getdwarf.c | 1 + - libdwfl/find-debuginfo.c | 2 +- libdwfl/libdwfl_crc32_file.c | 9 +++++++++ libdwfl/linux-kernel-modules.c | 1 + - libebl/eblopenbackend.c | 2 +- libelf/elf.h | 8 ++++++-- libelf/libelf.h | 1 + libelf/libelfP.h | 1 + - src/addr2line.c | 2 +- - src/ar.c | 2 +- - src/arlib.c | 2 +- - src/arlib2.c | 2 +- - src/elfcmp.c | 2 +- - src/elflint.c | 2 +- - src/findtextrel.c | 2 +- - src/nm.c | 2 +- - src/objdump.c | 2 +- - src/ranlib.c | 2 +- - src/readelf.c | 2 +- - src/size.c | 2 +- - src/stack.c | 2 +- - src/strings.c | 2 +- - src/strip.c | 2 +- - src/unstrip.c | 2 +- - tests/addrscopes.c | 2 +- - tests/allregs.c | 2 +- - tests/backtrace-data.c | 2 +- - tests/backtrace-dwarf.c | 2 +- - tests/backtrace.c | 2 +- - tests/buildid.c | 2 +- - tests/debugaltlink.c | 2 +- - tests/debuglink.c | 2 +- - tests/deleted.c | 2 +- - tests/dwfl-addr-sect.c | 2 +- - tests/dwfl-bug-addr-overflow.c | 2 +- - tests/dwfl-bug-fd-leak.c | 2 +- - tests/dwfl-bug-getmodules.c | 2 +- - tests/dwfl-report-elf-align.c | 2 +- - tests/dwfllines.c | 2 +- - tests/dwflmodtest.c | 2 +- - tests/dwflsyms.c | 2 +- - tests/early-offscn.c | 2 +- - tests/ecp.c | 2 +- - tests/find-prologues.c | 2 +- - tests/funcretval.c | 2 +- - tests/funcscopes.c | 2 +- - tests/getsrc_die.c | 2 +- - tests/line2addr.c | 2 +- - tests/low_high_pc.c | 2 +- - tests/md5-sha1-test.c | 2 +- - tests/rdwrmmap.c | 2 +- - tests/saridx.c | 2 +- - tests/sectiondump.c | 2 +- - tests/varlocs.c | 2 +- - tests/vdsosyms.c | 2 +- - 69 files changed, 95 insertions(+), 64 deletions(-) + 12 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 2ff444e7..41f77df8 100644 +index 2ff444e..41f77df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h @@ -96,28 +38,8 @@ index 2ff444e7..41f77df8 100644 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ COPYING COPYING-GPLV2 COPYING-LGPLV3 -diff --git a/lib/color.c b/lib/color.c -index f62389d5..a2a84b46 100644 ---- a/lib/color.c -+++ b/lib/color.c -@@ -32,13 +32,14 @@ - #endif - - #include <argp.h> --#include <error.h> -+#include <err.h> - #include <libintl.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include "libeu.h" - #include "color.h" -+#include "system.h" - - /* Prototype for option handler. */ - static error_t parse_opt (int key, char *arg, struct argp_state *state); diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h -index dac2a5f5..43016fc3 100644 +index dac2a5f..43016fc 100644 --- a/lib/fixedsizehash.h +++ b/lib/fixedsizehash.h @@ -30,7 +30,6 @@ @@ -129,10 +51,19 @@ index dac2a5f5..43016fc3 100644 #include <system.h> diff --git a/lib/system.h b/lib/system.h -index 92033355..1a601319 100644 +index 292082b..308a762 100644 --- a/lib/system.h +++ b/lib/system.h -@@ -50,6 +50,16 @@ +@@ -30,7 +30,7 @@ + #define LIB_SYSTEM_H 1 + + #include <errno.h> +-#include <error.h> ++#include <err.h> + #include <stddef.h> + #include <stdint.h> + #include <sys/param.h> +@@ -51,6 +51,16 @@ #else # error "Unknown byte order" #endif @@ -149,89 +80,11 @@ index 92033355..1a601319 100644 #ifndef MAX #define MAX(m, n) ((m) < (n) ? (n) : (m)) -diff --git a/lib/xmalloc.c b/lib/xmalloc.c -index 0cde384f..217b0541 100644 ---- a/lib/xmalloc.c -+++ b/lib/xmalloc.c -@@ -30,7 +30,7 @@ - # include <config.h> - #endif - --#include <error.h> -+#include <err.h> - #include <libintl.h> - #include <stddef.h> - #include <stdlib.h> -diff --git a/libasm/asm_end.c b/libasm/asm_end.c -index ced24f50..4ad918c4 100644 ---- a/libasm/asm_end.c -+++ b/libasm/asm_end.c -@@ -32,7 +32,7 @@ - #endif - - #include <assert.h> --#include <error.h> -+#include <err.h> - #include <libintl.h> - #include <stdio.h> - #include <stdlib.h> -diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c -index ddbb25df..74a598d9 100644 ---- a/libasm/asm_newscn.c -+++ b/libasm/asm_newscn.c -@@ -32,7 +32,7 @@ - #endif - - #include <assert.h> --#include <error.h> -+#include <err.h> - #include <libintl.h> - #include <stdlib.h> - #include <string.h> -diff --git a/libcpu/i386_gendis.c b/libcpu/i386_gendis.c -index aae5eae6..6d760165 100644 ---- a/libcpu/i386_gendis.c -+++ b/libcpu/i386_gendis.c -@@ -31,7 +31,7 @@ - # include <config.h> - #endif - --#include <error.h> -+#include <err.h> - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> -diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c -index ba5f4aa5..b1e41916 100644 ---- a/libcpu/i386_lex.c -+++ b/libcpu/i386_lex.c -@@ -577,7 +577,7 @@ char *i386_text; - #endif - - #include <ctype.h> --#include <error.h> -+#include <err.h> - #include <libintl.h> - - #include <libeu.h> -diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c -index 6fa7ce3d..bb270061 100644 ---- a/libcpu/i386_parse.c -+++ b/libcpu/i386_parse.c -@@ -107,7 +107,7 @@ - #include <assert.h> - #include <ctype.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <inttypes.h> - #include <libintl.h> - #include <math.h> diff --git a/libdw/Makefile.am b/libdw/Makefile.am -index ff8c291e..89e792aa 100644 +index 7a3d532..7ac1241 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am -@@ -105,7 +105,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) +@@ -108,7 +108,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ ../libdwfl/libdwfl_pic.a ../libebl/libebl.a libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so @@ -241,21 +94,8 @@ index ff8c291e..89e792aa 100644 libdw_so_SOURCES = libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) # The rpath is necessary for libebl because its $ORIGIN use will -diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c -index 28a8cf6e..29aeb3f7 100644 ---- a/libdw/libdw_alloc.c -+++ b/libdw/libdw_alloc.c -@@ -31,7 +31,7 @@ - # include <config.h> - #endif - --#include <error.h> -+#include <err.h> - #include <errno.h> - #include <stdlib.h> - #include "libdwP.h" diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c -index ee0c1646..b06ab596 100644 +index cc6c3f6..b06ab59 100644 --- a/libdwfl/dwfl_build_id_find_elf.c +++ b/libdwfl/dwfl_build_id_find_elf.c @@ -31,6 +31,7 @@ @@ -266,17 +106,8 @@ index ee0c1646..b06ab596 100644 #include <inttypes.h> #include <fcntl.h> #include <unistd.h> -@@ -99,7 +100,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name, - { - if (*file_name != NULL) - free (*file_name); -- *file_name = canonicalize_file_name (name); -+ *file_name = realpath (name, NULL); - if (*file_name == NULL) - { - *file_name = name; diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c -index 7bcf61cc..c345797a 100644 +index 7bcf61c..c345797 100644 --- a/libdwfl/dwfl_error.c +++ b/libdwfl/dwfl_error.c @@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error) @@ -298,7 +129,7 @@ index 7bcf61cc..c345797a 100644 return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c -index 9775aced..511c4a6a 100644 +index af6838a..c079d6a 100644 --- a/libdwfl/dwfl_module_getdwarf.c +++ b/libdwfl/dwfl_module_getdwarf.c @@ -35,6 +35,7 @@ @@ -309,21 +140,8 @@ index 9775aced..511c4a6a 100644 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */ #include "../libelf/libelfP.h" #include "system.h" -diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c -index 6d5a42a6..9267788d 100644 ---- a/libdwfl/find-debuginfo.c -+++ b/libdwfl/find-debuginfo.c -@@ -389,7 +389,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod, - /* If FILE_NAME is a symlink, the debug file might be associated - with the symlink target name instead. */ - -- char *canon = canonicalize_file_name (file_name); -+ char *canon = realpath (file_name, NULL); - if (canon != NULL && strcmp (file_name, canon)) - fd = find_debuginfo_in_path (mod, canon, - debuglink_file, debuglink_crc, diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c -index f849128d..6f0aca1b 100644 +index f849128..6f0aca1 100644 --- a/libdwfl/libdwfl_crc32_file.c +++ b/libdwfl/libdwfl_crc32_file.c @@ -29,6 +29,15 @@ @@ -343,7 +161,7 @@ index f849128d..6f0aca1b 100644 #define crc32 __libdwfl_crc32 #include <libdwflP.h> diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index 9d0fef2c..9fc09b88 100644 +index 9d0fef2..9fc09b8 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -40,6 +40,7 @@ @@ -354,21 +172,8 @@ index 9d0fef2c..9fc09b88 100644 #include <inttypes.h> #include <errno.h> #include <stdio.h> -diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c -index 53713963..2e66dfdd 100644 ---- a/libebl/eblopenbackend.c -+++ b/libebl/eblopenbackend.c -@@ -32,7 +32,7 @@ - - #include <assert.h> - #include <dlfcn.h> --#include <error.h> -+#include <err.h> - #include <libelfP.h> - #include <dwarf.h> - #include <stdlib.h> diff --git a/libelf/elf.h b/libelf/elf.h -index 5cf2b934..990b3afb 100644 +index 5dc632b..14da1b7 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -21,7 +21,9 @@ @@ -382,9 +187,9 @@ index 5cf2b934..990b3afb 100644 /* Standard ELF types. */ -@@ -3705,6 +3707,8 @@ enum - #define R_BPF_NONE 0 /* No reloc */ - #define R_BPF_MAP_FD 1 /* Map fd to pointer */ +@@ -3937,6 +3939,8 @@ enum + #define R_METAG_TLS_LE_HI16 60 + #define R_METAG_TLS_LE_LO16 61 -__END_DECLS +#ifdef __cplusplus @@ -393,7 +198,7 @@ index 5cf2b934..990b3afb 100644 #endif /* elf.h */ diff --git a/libelf/libelf.h b/libelf/libelf.h -index 547c0f50..dd78799e 100644 +index d11358c..4cf9272 100644 --- a/libelf/libelf.h +++ b/libelf/libelf.h @@ -29,6 +29,7 @@ @@ -405,7 +210,7 @@ index 547c0f50..dd78799e 100644 #include <sys/types.h> diff --git a/libelf/libelfP.h b/libelf/libelfP.h -index 7ee6625a..58408997 100644 +index ed216c8..415e6f6 100644 --- a/libelf/libelfP.h +++ b/libelf/libelfP.h @@ -32,6 +32,7 @@ @@ -416,614 +221,6 @@ index 7ee6625a..58408997 100644 #include <errno.h> #include <stdbool.h> -diff --git a/src/addr2line.c b/src/addr2line.c -index 444ee52c..9596fa67 100644 ---- a/src/addr2line.c -+++ b/src/addr2line.c -@@ -23,7 +23,7 @@ - #include <argp.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <inttypes.h> - #include <libdwfl.h> -diff --git a/src/ar.c b/src/ar.c -index ec32cee5..4efd729c 100644 ---- a/src/ar.c -+++ b/src/ar.c -@@ -22,7 +22,7 @@ - - #include <argp.h> - #include <assert.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <libintl.h> -diff --git a/src/arlib.c b/src/arlib.c -index e0839aab..1143658f 100644 ---- a/src/arlib.c -+++ b/src/arlib.c -@@ -21,7 +21,7 @@ - #endif - - #include <assert.h> --#include <error.h> -+#include <err.h> - #include <gelf.h> - #include <inttypes.h> - #include <libintl.h> -diff --git a/src/arlib2.c b/src/arlib2.c -index 553fc57b..46443d0e 100644 ---- a/src/arlib2.c -+++ b/src/arlib2.c -@@ -20,7 +20,7 @@ - # include <config.h> - #endif - --#include <error.h> -+#include <err.h> - #include <libintl.h> - #include <limits.h> - #include <string.h> -diff --git a/src/elfcmp.c b/src/elfcmp.c -index 50464207..cff183fa 100644 ---- a/src/elfcmp.c -+++ b/src/elfcmp.c -@@ -23,7 +23,7 @@ - #include <argp.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <locale.h> - #include <libintl.h> -diff --git a/src/elflint.c b/src/elflint.c -index df1b3a03..67d8d134 100644 ---- a/src/elflint.c -+++ b/src/elflint.c -@@ -24,7 +24,7 @@ - #include <assert.h> - #include <byteswap.h> - #include <endian.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/src/findtextrel.c b/src/findtextrel.c -index 8f1e239a..71463af3 100644 ---- a/src/findtextrel.c -+++ b/src/findtextrel.c -@@ -23,7 +23,7 @@ - #include <argp.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <libdw.h> -diff --git a/src/nm.c b/src/nm.c -index 969c6d35..3113c04c 100644 ---- a/src/nm.c -+++ b/src/nm.c -@@ -26,7 +26,7 @@ - #include <ctype.h> - #include <dwarf.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/src/objdump.c b/src/objdump.c -index 0dd9a6aa..9c8bf149 100644 ---- a/src/objdump.c -+++ b/src/objdump.c -@@ -21,7 +21,7 @@ - #endif - - #include <argp.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <inttypes.h> - #include <libintl.h> -diff --git a/src/ranlib.c b/src/ranlib.c -index cc0ee233..ae851e40 100644 ---- a/src/ranlib.c -+++ b/src/ranlib.c -@@ -24,7 +24,7 @@ - #include <argp.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <libintl.h> -diff --git a/src/readelf.c b/src/readelf.c -index 6a27e7e0..4759a965 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -25,7 +25,7 @@ - #include <ctype.h> - #include <dwarf.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/src/size.c b/src/size.c -index ad8dbcbb..fd83be06 100644 ---- a/src/size.c -+++ b/src/size.c -@@ -21,7 +21,7 @@ - #endif - - #include <argp.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/src/stack.c b/src/stack.c -index 6f2ff69f..6da0243d 100644 ---- a/src/stack.c -+++ b/src/stack.c -@@ -18,7 +18,7 @@ - #include <config.h> - #include <assert.h> - #include <argp.h> --#include <error.h> -+#include <err.h> - #include <stdlib.h> - #include <inttypes.h> - #include <stdio.h> -diff --git a/src/strings.c b/src/strings.c -index 03d0f133..5c311cbd 100644 ---- a/src/strings.c -+++ b/src/strings.c -@@ -25,7 +25,7 @@ - #include <ctype.h> - #include <endian.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/src/strip.c b/src/strip.c -index c7830ec6..0d7f148d 100644 ---- a/src/strip.c -+++ b/src/strip.c -@@ -24,7 +24,7 @@ - #include <assert.h> - #include <byteswap.h> - #include <endian.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <fnmatch.h> - #include <gelf.h> -diff --git a/src/unstrip.c b/src/unstrip.c -index 50749093..3d4f9525 100644 ---- a/src/unstrip.c -+++ b/src/unstrip.c -@@ -31,7 +31,7 @@ - #include <argp.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <fnmatch.h> - #include <libintl.h> -diff --git a/tests/addrscopes.c b/tests/addrscopes.c -index 791569f5..54f4311b 100644 ---- a/tests/addrscopes.c -+++ b/tests/addrscopes.c -@@ -25,7 +25,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - - -diff --git a/tests/allregs.c b/tests/allregs.c -index 286f7e3c..c9de0897 100644 ---- a/tests/allregs.c -+++ b/tests/allregs.c -@@ -21,7 +21,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> -+#include <err.h> - #include <locale.h> - #include <argp.h> - #include <assert.h> -diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c -index a387d8ff..955c27d1 100644 ---- a/tests/backtrace-data.c -+++ b/tests/backtrace-data.c -@@ -27,7 +27,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <unistd.h> - #include <dwarf.h> - #if defined(__x86_64__) && defined(__linux__) -diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c -index 2dc8a9a2..24ca7fb0 100644 ---- a/tests/backtrace-dwarf.c -+++ b/tests/backtrace-dwarf.c -@@ -22,7 +22,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/wait.h> -diff --git a/tests/backtrace.c b/tests/backtrace.c -index f5dd761f..a93a8f03 100644 ---- a/tests/backtrace.c -+++ b/tests/backtrace.c -@@ -24,7 +24,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <unistd.h> - #include <dwarf.h> - #ifdef __linux__ -diff --git a/tests/buildid.c b/tests/buildid.c -index 87c18773..2953e6bb 100644 ---- a/tests/buildid.c -+++ b/tests/buildid.c -@@ -23,7 +23,7 @@ - #include ELFUTILS_HEADER(elf) - #include ELFUTILS_HEADER(dwelf) - #include <stdio.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <stdlib.h> - #include <sys/types.h> -diff --git a/tests/debugaltlink.c b/tests/debugaltlink.c -index 6d97d500..ee7e559e 100644 ---- a/tests/debugaltlink.c -+++ b/tests/debugaltlink.c -@@ -23,7 +23,7 @@ - #include ELFUTILS_HEADER(dw) - #include ELFUTILS_HEADER(dwelf) - #include <stdio.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <stdlib.h> - #include <sys/types.h> -diff --git a/tests/debuglink.c b/tests/debuglink.c -index 935d1029..741cb814 100644 ---- a/tests/debuglink.c -+++ b/tests/debuglink.c -@@ -21,7 +21,7 @@ - #include <errno.h> - #include ELFUTILS_HEADER(dwelf) - #include <stdio.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <stdlib.h> - #include <sys/types.h> -diff --git a/tests/deleted.c b/tests/deleted.c -index 6be35bc2..01907113 100644 ---- a/tests/deleted.c -+++ b/tests/deleted.c -@@ -21,7 +21,7 @@ - #include <unistd.h> - #include <assert.h> - #include <stdio.h> --#include <error.h> -+#include <err.h> - #include <errno.h> - #ifdef __linux__ - #include <sys/prctl.h> -diff --git a/tests/dwfl-addr-sect.c b/tests/dwfl-addr-sect.c -index 21e470a3..1ea1e3b2 100644 ---- a/tests/dwfl-addr-sect.c -+++ b/tests/dwfl-addr-sect.c -@@ -23,7 +23,7 @@ - #include <stdio_ext.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> -+#include <err.h> - #include <locale.h> - #include <argp.h> - #include ELFUTILS_HEADER(dwfl) -diff --git a/tests/dwfl-bug-addr-overflow.c b/tests/dwfl-bug-addr-overflow.c -index aa8030e1..02c8bef9 100644 ---- a/tests/dwfl-bug-addr-overflow.c -+++ b/tests/dwfl-bug-addr-overflow.c -@@ -20,7 +20,7 @@ - #include <inttypes.h> - #include <stdio.h> - #include <stdio_ext.h> --#include <error.h> -+#include <err.h> - #include <locale.h> - #include ELFUTILS_HEADER(dwfl) - -diff --git a/tests/dwfl-bug-fd-leak.c b/tests/dwfl-bug-fd-leak.c -index 689cdd79..5973da39 100644 ---- a/tests/dwfl-bug-fd-leak.c -+++ b/tests/dwfl-bug-fd-leak.c -@@ -24,7 +24,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <unistd.h> - #include <dwarf.h> - -diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c -index 1ee989f8..fd62e653 100644 ---- a/tests/dwfl-bug-getmodules.c -+++ b/tests/dwfl-bug-getmodules.c -@@ -18,7 +18,7 @@ - #include <config.h> - #include ELFUTILS_HEADER(dwfl) - --#include <error.h> -+#include <err.h> - - static const Dwfl_Callbacks callbacks = - { -diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c -index a4e97d3c..f471587c 100644 ---- a/tests/dwfl-report-elf-align.c -+++ b/tests/dwfl-report-elf-align.c -@@ -20,7 +20,7 @@ - #include <inttypes.h> - #include <stdio.h> - #include <stdio_ext.h> --#include <error.h> -+#include <err.h> - #include <locale.h> - #include <string.h> - #include <stdlib.h> -diff --git a/tests/dwfllines.c b/tests/dwfllines.c -index 90379dd2..cbdf6c4c 100644 ---- a/tests/dwfllines.c -+++ b/tests/dwfllines.c -@@ -27,7 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> -+#include <err.h> - - int - main (int argc, char *argv[]) -diff --git a/tests/dwflmodtest.c b/tests/dwflmodtest.c -index 0027f96b..e68d3bca 100644 ---- a/tests/dwflmodtest.c -+++ b/tests/dwflmodtest.c -@@ -23,7 +23,7 @@ - #include <stdio_ext.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> -+#include <err.h> - #include <locale.h> - #include <argp.h> - #include ELFUTILS_HEADER(dwfl) -diff --git a/tests/dwflsyms.c b/tests/dwflsyms.c -index 49ac3346..cf078301 100644 ---- a/tests/dwflsyms.c -+++ b/tests/dwflsyms.c -@@ -25,7 +25,7 @@ - #include <stdio.h> - #include <stdio_ext.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - - static const char * -diff --git a/tests/early-offscn.c b/tests/early-offscn.c -index 924cb9ef..6f60d5a3 100644 ---- a/tests/early-offscn.c -+++ b/tests/early-offscn.c -@@ -19,7 +19,7 @@ - #endif - - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <stdio.h> -diff --git a/tests/ecp.c b/tests/ecp.c -index 38a6859e..743cea5d 100644 ---- a/tests/ecp.c -+++ b/tests/ecp.c -@@ -20,7 +20,7 @@ - #endif - - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <stdlib.h> -diff --git a/tests/find-prologues.c b/tests/find-prologues.c -index ba8ae371..76f5f047 100644 ---- a/tests/find-prologues.c -+++ b/tests/find-prologues.c -@@ -25,7 +25,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <fnmatch.h> - -diff --git a/tests/funcretval.c b/tests/funcretval.c -index 8d19d117..c8aaa93d 100644 ---- a/tests/funcretval.c -+++ b/tests/funcretval.c -@@ -25,7 +25,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <fnmatch.h> - -diff --git a/tests/funcscopes.c b/tests/funcscopes.c -index 9c901858..dbccb89e 100644 ---- a/tests/funcscopes.c -+++ b/tests/funcscopes.c -@@ -25,7 +25,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <fnmatch.h> - -diff --git a/tests/getsrc_die.c b/tests/getsrc_die.c -index 055aede0..9c394dd0 100644 ---- a/tests/getsrc_die.c -+++ b/tests/getsrc_die.c -@@ -19,7 +19,7 @@ - #endif - - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <inttypes.h> - #include <libelf.h> -diff --git a/tests/line2addr.c b/tests/line2addr.c -index e0d65d3d..9bf0023b 100644 ---- a/tests/line2addr.c -+++ b/tests/line2addr.c -@@ -26,7 +26,7 @@ - #include <locale.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> -+#include <err.h> - - - static void -diff --git a/tests/low_high_pc.c b/tests/low_high_pc.c -index d0f43023..8da4fbdf 100644 ---- a/tests/low_high_pc.c -+++ b/tests/low_high_pc.c -@@ -25,7 +25,7 @@ - #include <stdio_ext.h> - #include <locale.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <fnmatch.h> - -diff --git a/tests/md5-sha1-test.c b/tests/md5-sha1-test.c -index d50355e9..3c41f40b 100644 ---- a/tests/md5-sha1-test.c -+++ b/tests/md5-sha1-test.c -@@ -19,7 +19,7 @@ - #endif - - #include <string.h> --#include <error.h> -+#include <err.h> - - #include "md5.h" - #include "sha1.h" -diff --git a/tests/rdwrmmap.c b/tests/rdwrmmap.c -index 6f027dfe..1ce5e6ed 100644 ---- a/tests/rdwrmmap.c -+++ b/tests/rdwrmmap.c -@@ -19,7 +19,7 @@ - #endif - - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> -diff --git a/tests/saridx.c b/tests/saridx.c -index 8a450d82..b3878013 100644 ---- a/tests/saridx.c -+++ b/tests/saridx.c -@@ -17,7 +17,7 @@ - - #include <config.h> - --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <stdio.h> -diff --git a/tests/sectiondump.c b/tests/sectiondump.c -index 3033fedc..8e888db3 100644 ---- a/tests/sectiondump.c -+++ b/tests/sectiondump.c -@@ -18,7 +18,7 @@ - #include <config.h> - - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <fcntl.h> - #include <gelf.h> - #include <inttypes.h> -diff --git a/tests/varlocs.c b/tests/varlocs.c -index c3fba89e..e043ea2c 100644 ---- a/tests/varlocs.c -+++ b/tests/varlocs.c -@@ -25,7 +25,7 @@ - #include <dwarf.h> - #include <stdio.h> - #include <stdlib.h> --#include <error.h> -+#include <err.h> - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -diff --git a/tests/vdsosyms.c b/tests/vdsosyms.c -index b876c10b..afb28232 100644 ---- a/tests/vdsosyms.c -+++ b/tests/vdsosyms.c -@@ -18,7 +18,7 @@ - #include <config.h> - #include <assert.h> - #include <errno.h> --#include <error.h> -+#include <err.h> - #include <inttypes.h> - #include <stdio.h> - #include <string.h> +-- +2.7.4 + |
