code.ossystems Code Review - openembedded-core.git/blob

   1 From 010b0c57e748440eb1ceb3d977875f2488d2b4ce Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Wed, 16 Aug 2017 10:06:26 +0800
   4 Subject: [PATCH] build: Provide alternatives for glibc assumptions helps
   5  compiling it on musl
   6
   7 Upstream-Status: Pending
   8 Signed-off-by: Khem Raj <raj.khem@gmail.com>
   9
  10 Rebase to 0.170
  11
  12 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  13 ---
  14  Makefile.am                      |  2 +-
  15  lib/color.c                      |  3 ++-
  16  lib/fixedsizehash.h              |  1 -
  17  lib/system.h                     | 10 ++++++++++
  18  lib/xmalloc.c                    |  2 +-
  19  libasm/asm_end.c                 |  2 +-
  20  libasm/asm_newscn.c              |  2 +-
  21  libcpu/i386_gendis.c             |  2 +-
  22  libcpu/i386_lex.c                |  2 +-
  23  libcpu/i386_parse.c              |  2 +-
  24  libdw/Makefile.am                |  3 ++-
  25  libdw/libdw_alloc.c              |  2 +-
  26  libdwfl/dwfl_build_id_find_elf.c |  3 ++-
  27  libdwfl/dwfl_error.c             |  4 +++-
  28  libdwfl/dwfl_module_getdwarf.c   |  1 +
  29  libdwfl/find-debuginfo.c         |  2 +-
  30  libdwfl/libdwfl_crc32_file.c     |  9 +++++++++
  31  libdwfl/linux-kernel-modules.c   |  1 +
  32  libebl/eblopenbackend.c          |  2 +-
  33  libelf/elf.h                     |  8 ++++++--
  34  libelf/libelf.h                  |  1 +
  35  libelf/libelfP.h                 |  1 +
  36  src/addr2line.c                  |  2 +-
  37  src/ar.c                         |  2 +-
  38  src/arlib.c                      |  2 +-
  39  src/arlib2.c                     |  2 +-
  40  src/elfcmp.c                     |  2 +-
  41  src/elflint.c                    |  2 +-
  42  src/findtextrel.c                |  2 +-
  43  src/nm.c                         |  2 +-
  44  src/objdump.c                    |  2 +-
  45  src/ranlib.c                     |  2 +-
  46  src/readelf.c                    |  2 +-
  47  src/size.c                       |  2 +-
  48  src/stack.c                      |  2 +-
  49  src/strings.c                    |  2 +-
  50  src/strip.c                      |  2 +-
  51  src/unstrip.c                    |  2 +-
  52  tests/addrscopes.c               |  2 +-
  53  tests/allregs.c                  |  2 +-
  54  tests/backtrace-data.c           |  2 +-
  55  tests/backtrace-dwarf.c          |  2 +-
  56  tests/backtrace.c                |  2 +-
  57  tests/buildid.c                  |  2 +-
  58  tests/debugaltlink.c             |  2 +-
  59  tests/debuglink.c                |  2 +-
  60  tests/deleted.c                  |  2 +-
  61  tests/dwfl-addr-sect.c           |  2 +-
  62  tests/dwfl-bug-addr-overflow.c   |  2 +-
  63  tests/dwfl-bug-fd-leak.c         |  2 +-
  64  tests/dwfl-bug-getmodules.c      |  2 +-
  65  tests/dwfl-report-elf-align.c    |  2 +-
  66  tests/dwfllines.c                |  2 +-
  67  tests/dwflmodtest.c              |  2 +-
  68  tests/dwflsyms.c                 |  2 +-
  69  tests/early-offscn.c             |  2 +-
  70  tests/ecp.c                      |  2 +-
  71  tests/find-prologues.c           |  2 +-
  72  tests/funcretval.c               |  2 +-
  73  tests/funcscopes.c               |  2 +-
  74  tests/getsrc_die.c               |  2 +-
  75  tests/line2addr.c                |  2 +-
  76  tests/low_high_pc.c              |  2 +-
  77  tests/md5-sha1-test.c            |  2 +-
  78  tests/rdwrmmap.c                 |  2 +-
  79  tests/saridx.c                   |  2 +-
  80  tests/sectiondump.c              |  2 +-
  81  tests/varlocs.c                  |  2 +-
  82  tests/vdsosyms.c                 |  2 +-
  83  69 files changed, 95 insertions(+), 64 deletions(-)
  84
  85 diff --git a/Makefile.am b/Makefile.am
  86 index 2ff444e..41f77df 100644
  87 --- a/Makefile.am
  88 +++ b/Makefile.am
  89 @@ -28,7 +28,7 @@ pkginclude_HEADERS = version.h
  90
  91  # Add doc back when we have some real content.
  92  SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
  93 -         backends src po tests
  94 +         backends po tests
  95
  96  EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
  97              COPYING COPYING-GPLV2 COPYING-LGPLV3
  98 diff --git a/lib/color.c b/lib/color.c
  99 index f62389d..a2a84b4 100644
 100 --- a/lib/color.c
 101 +++ b/lib/color.c
 102 @@ -32,13 +32,14 @@
 103  #endif
 104
 105  #include <argp.h>
 106 -#include <error.h>
 107 +#include <err.h>
 108  #include <libintl.h>
 109  #include <stdlib.h>
 110  #include <string.h>
 111  #include <unistd.h>
 112  #include "libeu.h"
 113  #include "color.h"
 114 +#include "system.h"
 115
 116  /* Prototype for option handler.  */
 117  static error_t parse_opt (int key, char *arg, struct argp_state *state);
 118 diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
 119 index dac2a5f..43016fc 100644
 120 --- a/lib/fixedsizehash.h
 121 +++ b/lib/fixedsizehash.h
 122 @@ -30,7 +30,6 @@
 123  #include <errno.h>
 124  #include <stdlib.h>
 125  #include <string.h>
 126 -#include <sys/cdefs.h>
 127
 128  #include <system.h>
 129
 130 diff --git a/lib/system.h b/lib/system.h
 131 index 9203335..1a60131 100644
 132 --- a/lib/system.h
 133 +++ b/lib/system.h
 134 @@ -50,6 +50,16 @@
 135  #else
 136  # error "Unknown byte order"
 137  #endif
 138 +#ifndef TEMP_FAILURE_RETRY
 139 +#define TEMP_FAILURE_RETRY(expression) \
 140 +  (__extension__                                                             \
 141 +    ({ long int __result;                                                    \
 142 +       do __result = (long int) (expression);                                \
 143 +       while (__result == -1L && errno == EINTR);                            \
 144 +       __result; }))
 145 +#endif
 146 +
 147 +#define error(status, errno, ...) err(status, __VA_ARGS__)
 148
 149  #ifndef MAX
 150  #define MAX(m, n) ((m) < (n) ? (n) : (m))
 151 diff --git a/lib/xmalloc.c b/lib/xmalloc.c
 152 index 0cde384..217b054 100644
 153 --- a/lib/xmalloc.c
 154 +++ b/lib/xmalloc.c
 155 @@ -30,7 +30,7 @@
 156  # include <config.h>
 157  #endif
 158
 159 -#include <error.h>
 160 +#include <err.h>
 161  #include <libintl.h>
 162  #include <stddef.h>
 163  #include <stdlib.h>
 164 diff --git a/libasm/asm_end.c b/libasm/asm_end.c
 165 index ced24f5..4ad918c 100644
 166 --- a/libasm/asm_end.c
 167 +++ b/libasm/asm_end.c
 168 @@ -32,7 +32,7 @@
 169  #endif
 170
 171  #include <assert.h>
 172 -#include <error.h>
 173 +#include <err.h>
 174  #include <libintl.h>
 175  #include <stdio.h>
 176  #include <stdlib.h>
 177 diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c
 178 index ddbb25d..74a598d 100644
 179 --- a/libasm/asm_newscn.c
 180 +++ b/libasm/asm_newscn.c
 181 @@ -32,7 +32,7 @@
 182  #endif
 183
 184  #include <assert.h>
 185 -#include <error.h>
 186 +#include <err.h>
 187  #include <libintl.h>
 188  #include <stdlib.h>
 189  #include <string.h>
 190 diff --git a/libcpu/i386_gendis.c b/libcpu/i386_gendis.c
 191 index aae5eae..6d76016 100644
 192 --- a/libcpu/i386_gendis.c
 193 +++ b/libcpu/i386_gendis.c
 194 @@ -31,7 +31,7 @@
 195  # include <config.h>
 196  #endif
 197
 198 -#include <error.h>
 199 +#include <err.h>
 200  #include <errno.h>
 201  #include <stdio.h>
 202  #include <stdlib.h>
 203 diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c
 204 index ba5f4aa..b1e4191 100644
 205 --- a/libcpu/i386_lex.c
 206 +++ b/libcpu/i386_lex.c
 207 @@ -577,7 +577,7 @@ char *i386_text;
 208  #endif
 209
 210  #include <ctype.h>
 211 -#include <error.h>
 212 +#include <err.h>
 213  #include <libintl.h>
 214
 215  #include <libeu.h>
 216 diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c
 217 index ef1ac35..48f2e64 100644
 218 --- a/libcpu/i386_parse.c
 219 +++ b/libcpu/i386_parse.c
 220 @@ -107,7 +107,7 @@
 221  #include <assert.h>
 222  #include <ctype.h>
 223  #include <errno.h>
 224 -#include <error.h>
 225 +#include <err.h>
 226  #include <inttypes.h>
 227  #include <libintl.h>
 228  #include <math.h>
 229 diff --git a/libdw/Makefile.am b/libdw/Makefile.am
 230 index ff8c291..89e792a 100644
 231 --- a/libdw/Makefile.am
 232 +++ b/libdw/Makefile.am
 233 @@ -105,7 +105,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
 234  libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \
 235           ../libdwfl/libdwfl_pic.a ../libebl/libebl.a
 236  libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
 237 -libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)
 238 +fts_LDADD = -lfts
 239 +libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) $(fts_LDADD)
 240  libdw_so_SOURCES =
 241  libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
 242  # The rpath is necessary for libebl because its $ORIGIN use will
 243 diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c
 244 index 28a8cf6..29aeb3f 100644
 245 --- a/libdw/libdw_alloc.c
 246 +++ b/libdw/libdw_alloc.c
 247 @@ -31,7 +31,7 @@
 248  # include <config.h>
 249  #endif
 250
 251 -#include <error.h>
 252 +#include <err.h>
 253  #include <errno.h>
 254  #include <stdlib.h>
 255  #include "libdwP.h"
 256 diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
 257 index ee0c164..b06ab59 100644
 258 --- a/libdwfl/dwfl_build_id_find_elf.c
 259 +++ b/libdwfl/dwfl_build_id_find_elf.c
 260 @@ -31,6 +31,7 @@
 261  #endif
 262
 263  #include "libdwflP.h"
 264 +#include "system.h"
 265  #include <inttypes.h>
 266  #include <fcntl.h>
 267  #include <unistd.h>
 268 @@ -99,7 +100,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name,
 269         {
 270           if (*file_name != NULL)
 271             free (*file_name);
 272 -         *file_name = canonicalize_file_name (name);
 273 +         *file_name = realpath (name, NULL);
 274           if (*file_name == NULL)
 275             {
 276               *file_name = name;
 277 diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
 278 index 7bcf61c..c345797 100644
 279 --- a/libdwfl/dwfl_error.c
 280 +++ b/libdwfl/dwfl_error.c
 281 @@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error)
 282  const char *
 283  dwfl_errmsg (int error)
 284  {
 285 +  static __thread char s[64] = "";
 286    if (error == 0 || error == -1)
 287      {
 288        int last_error = global_error;
 289 @@ -154,7 +155,8 @@ dwfl_errmsg (int error)
 290    switch (error &~ 0xffff)
 291      {
 292      case OTHER_ERROR (ERRNO):
 293 -      return strerror_r (error & 0xffff, "bad", 0);
 294 +      strerror_r (error & 0xffff, s, sizeof(s));
 295 +      return s;
 296      case OTHER_ERROR (LIBELF):
 297        return elf_errmsg (error & 0xffff);
 298      case OTHER_ERROR (LIBDW):
 299 diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
 300 index 9775ace..511c4a6 100644
 301 --- a/libdwfl/dwfl_module_getdwarf.c
 302 +++ b/libdwfl/dwfl_module_getdwarf.c
 303 @@ -35,6 +35,7 @@
 304  #include <fcntl.h>
 305  #include <string.h>
 306  #include <unistd.h>
 307 +#include "system.h"
 308  #include "../libdw/libdwP.h"   /* DWARF_E_* values are here.  */
 309  #include "../libelf/libelfP.h"
 310  #include "system.h"
 311 diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
 312 index 6d5a42a..9267788 100644
 313 --- a/libdwfl/find-debuginfo.c
 314 +++ b/libdwfl/find-debuginfo.c
 315 @@ -389,7 +389,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod,
 316        /* If FILE_NAME is a symlink, the debug file might be associated
 317          with the symlink target name instead.  */
 318
 319 -      char *canon = canonicalize_file_name (file_name);
 320 +      char *canon = realpath (file_name, NULL);
 321        if (canon != NULL && strcmp (file_name, canon))
 322         fd = find_debuginfo_in_path (mod, canon,
 323                                      debuglink_file, debuglink_crc,
 324 diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
 325 index f849128..6f0aca1 100644
 326 --- a/libdwfl/libdwfl_crc32_file.c
 327 +++ b/libdwfl/libdwfl_crc32_file.c
 328 @@ -29,6 +29,15 @@
 329  # include <config.h>
 330  #endif
 331
 332 +#ifndef TEMP_FAILURE_RETRY
 333 +#define TEMP_FAILURE_RETRY(expression) \
 334 +  (__extension__                                                             \
 335 +    ({ long int __result;                                                    \
 336 +       do __result = (long int) (expression);                                \
 337 +       while (__result == -1L && errno == EINTR);                            \
 338 +       __result; }))
 339 +#endif
 340 +
 341  #define crc32_file attribute_hidden __libdwfl_crc32_file
 342  #define crc32 __libdwfl_crc32
 343  #include <libdwflP.h>
 344 diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
 345 index 9d0fef2..9fc09b8 100644
 346 --- a/libdwfl/linux-kernel-modules.c
 347 +++ b/libdwfl/linux-kernel-modules.c
 348 @@ -40,6 +40,7 @@
 349  #include <system.h>
 350
 351  #include "libdwflP.h"
 352 +#include "system.h"
 353  #include <inttypes.h>
 354  #include <errno.h>
 355  #include <stdio.h>
 356 diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
 357 index 5371396..2e66dfd 100644
 358 --- a/libebl/eblopenbackend.c
 359 +++ b/libebl/eblopenbackend.c
 360 @@ -32,7 +32,7 @@
 361
 362  #include <assert.h>
 363  #include <dlfcn.h>
 364 -#include <error.h>
 365 +#include <err.h>
 366  #include <libelfP.h>
 367  #include <dwarf.h>
 368  #include <stdlib.h>
 369 diff --git a/libelf/elf.h b/libelf/elf.h
 370 index 5cf2b93..990b3af 100644
 371 --- a/libelf/elf.h
 372 +++ b/libelf/elf.h
 373 @@ -21,7 +21,9 @@
 374
 375  #include <features.h>
 376
 377 -__BEGIN_DECLS
 378 +#ifdef __cplusplus
 379 +extern "C" {
 380 +#endif
 381
 382  /* Standard ELF types.  */
 383
 384 @@ -3705,6 +3707,8 @@ enum
 385  #define R_BPF_NONE             0       /* No reloc */
 386  #define R_BPF_MAP_FD           1       /* Map fd to pointer */
 387
 388 -__END_DECLS
 389 +#ifdef __cplusplus
 390 +}
 391 +#endif
 392
 393  #endif /* elf.h */
 394 diff --git a/libelf/libelf.h b/libelf/libelf.h
 395 index 547c0f5..dd78799 100644
 396 --- a/libelf/libelf.h
 397 +++ b/libelf/libelf.h
 398 @@ -29,6 +29,7 @@
 399  #ifndef _LIBELF_H
 400  #define _LIBELF_H 1
 401
 402 +#include <fcntl.h>
 403  #include <stdint.h>
 404  #include <sys/types.h>
 405
 406 diff --git a/libelf/libelfP.h b/libelf/libelfP.h
 407 index 7ee6625..5840899 100644
 408 --- a/libelf/libelfP.h
 409 +++ b/libelf/libelfP.h
 410 @@ -32,6 +32,7 @@
 411
 412  #include <ar.h>
 413  #include <gelf.h>
 414 +#include <libelf.h>
 415
 416  #include <errno.h>
 417  #include <stdbool.h>
 418 diff --git a/src/addr2line.c b/src/addr2line.c
 419 index ba414a7..04b7116 100644
 420 --- a/src/addr2line.c
 421 +++ b/src/addr2line.c
 422 @@ -23,7 +23,7 @@
 423  #include <argp.h>
 424  #include <assert.h>
 425  #include <errno.h>
 426 -#include <error.h>
 427 +#include <err.h>
 428  #include <fcntl.h>
 429  #include <inttypes.h>
 430  #include <libdwfl.h>
 431 diff --git a/src/ar.c b/src/ar.c
 432 index ec32cee..4efd729 100644
 433 --- a/src/ar.c
 434 +++ b/src/ar.c
 435 @@ -22,7 +22,7 @@
 436
 437  #include <argp.h>
 438  #include <assert.h>
 439 -#include <error.h>
 440 +#include <err.h>
 441  #include <fcntl.h>
 442  #include <gelf.h>
 443  #include <libintl.h>
 444 diff --git a/src/arlib.c b/src/arlib.c
 445 index e0839aa..1143658 100644
 446 --- a/src/arlib.c
 447 +++ b/src/arlib.c
 448 @@ -21,7 +21,7 @@
 449  #endif
 450
 451  #include <assert.h>
 452 -#include <error.h>
 453 +#include <err.h>
 454  #include <gelf.h>
 455  #include <inttypes.h>
 456  #include <libintl.h>
 457 diff --git a/src/arlib2.c b/src/arlib2.c
 458 index 553fc57..46443d0 100644
 459 --- a/src/arlib2.c
 460 +++ b/src/arlib2.c
 461 @@ -20,7 +20,7 @@
 462  # include <config.h>
 463  #endif
 464
 465 -#include <error.h>
 466 +#include <err.h>
 467  #include <libintl.h>
 468  #include <limits.h>
 469  #include <string.h>
 470 diff --git a/src/elfcmp.c b/src/elfcmp.c
 471 index 5046420..cff183f 100644
 472 --- a/src/elfcmp.c
 473 +++ b/src/elfcmp.c
 474 @@ -23,7 +23,7 @@
 475  #include <argp.h>
 476  #include <assert.h>
 477  #include <errno.h>
 478 -#include <error.h>
 479 +#include <err.h>
 480  #include <fcntl.h>
 481  #include <locale.h>
 482  #include <libintl.h>
 483 diff --git a/src/elflint.c b/src/elflint.c
 484 index 51e53c2..da0b0dc 100644
 485 --- a/src/elflint.c
 486 +++ b/src/elflint.c
 487 @@ -24,7 +24,7 @@
 488  #include <assert.h>
 489  #include <byteswap.h>
 490  #include <endian.h>
 491 -#include <error.h>
 492 +#include <err.h>
 493  #include <fcntl.h>
 494  #include <gelf.h>
 495  #include <inttypes.h>
 496 diff --git a/src/findtextrel.c b/src/findtextrel.c
 497 index 8f1e239..71463af 100644
 498 --- a/src/findtextrel.c
 499 +++ b/src/findtextrel.c
 500 @@ -23,7 +23,7 @@
 501  #include <argp.h>
 502  #include <assert.h>
 503  #include <errno.h>
 504 -#include <error.h>
 505 +#include <err.h>
 506  #include <fcntl.h>
 507  #include <gelf.h>
 508  #include <libdw.h>
 509 diff --git a/src/nm.c b/src/nm.c
 510 index 969c6d3..3113c04 100644
 511 --- a/src/nm.c
 512 +++ b/src/nm.c
 513 @@ -26,7 +26,7 @@
 514  #include <ctype.h>
 515  #include <dwarf.h>
 516  #include <errno.h>
 517 -#include <error.h>
 518 +#include <err.h>
 519  #include <fcntl.h>
 520  #include <gelf.h>
 521  #include <inttypes.h>
 522 diff --git a/src/objdump.c b/src/objdump.c
 523 index 860cfac..61e67bf 100644
 524 --- a/src/objdump.c
 525 +++ b/src/objdump.c
 526 @@ -21,7 +21,7 @@
 527  #endif
 528
 529  #include <argp.h>
 530 -#include <error.h>
 531 +#include <err.h>
 532  #include <fcntl.h>
 533  #include <inttypes.h>
 534  #include <libintl.h>
 535 diff --git a/src/ranlib.c b/src/ranlib.c
 536 index cc0ee23..ae851e4 100644
 537 --- a/src/ranlib.c
 538 +++ b/src/ranlib.c
 539 @@ -24,7 +24,7 @@
 540  #include <argp.h>
 541  #include <assert.h>
 542  #include <errno.h>
 543 -#include <error.h>
 544 +#include <err.h>
 545  #include <fcntl.h>
 546  #include <gelf.h>
 547  #include <libintl.h>
 548 diff --git a/src/readelf.c b/src/readelf.c
 549 index 346eccd..c831aa8 100644
 550 --- a/src/readelf.c
 551 +++ b/src/readelf.c
 552 @@ -25,7 +25,7 @@
 553  #include <ctype.h>
 554  #include <dwarf.h>
 555  #include <errno.h>
 556 -#include <error.h>
 557 +#include <err.h>
 558  #include <fcntl.h>
 559  #include <gelf.h>
 560  #include <inttypes.h>
 561 diff --git a/src/size.c b/src/size.c
 562 index ad8dbcb..fd83be0 100644
 563 --- a/src/size.c
 564 +++ b/src/size.c
 565 @@ -21,7 +21,7 @@
 566  #endif
 567
 568  #include <argp.h>
 569 -#include <error.h>
 570 +#include <err.h>
 571  #include <fcntl.h>
 572  #include <gelf.h>
 573  #include <inttypes.h>
 574 diff --git a/src/stack.c b/src/stack.c
 575 index 6f2ff69..6da0243 100644
 576 --- a/src/stack.c
 577 +++ b/src/stack.c
 578 @@ -18,7 +18,7 @@
 579  #include <config.h>
 580  #include <assert.h>
 581  #include <argp.h>
 582 -#include <error.h>
 583 +#include <err.h>
 584  #include <stdlib.h>
 585  #include <inttypes.h>
 586  #include <stdio.h>
 587 diff --git a/src/strings.c b/src/strings.c
 588 index d214356..76cb26b 100644
 589 --- a/src/strings.c
 590 +++ b/src/strings.c
 591 @@ -25,7 +25,7 @@
 592  #include <ctype.h>
 593  #include <endian.h>
 594  #include <errno.h>
 595 -#include <error.h>
 596 +#include <err.h>
 597  #include <fcntl.h>
 598  #include <gelf.h>
 599  #include <inttypes.h>
 600 diff --git a/src/strip.c b/src/strip.c
 601 index c7830ec..0d7f148 100644
 602 --- a/src/strip.c
 603 +++ b/src/strip.c
 604 @@ -24,7 +24,7 @@
 605  #include <assert.h>
 606  #include <byteswap.h>
 607  #include <endian.h>
 608 -#include <error.h>
 609 +#include <err.h>
 610  #include <fcntl.h>
 611  #include <fnmatch.h>
 612  #include <gelf.h>
 613 diff --git a/src/unstrip.c b/src/unstrip.c
 614 index 5074909..3d4f952 100644
 615 --- a/src/unstrip.c
 616 +++ b/src/unstrip.c
 617 @@ -31,7 +31,7 @@
 618  #include <argp.h>
 619  #include <assert.h>
 620  #include <errno.h>
 621 -#include <error.h>
 622 +#include <err.h>
 623  #include <fcntl.h>
 624  #include <fnmatch.h>
 625  #include <libintl.h>
 626 diff --git a/tests/addrscopes.c b/tests/addrscopes.c
 627 index 791569f..54f4311 100644
 628 --- a/tests/addrscopes.c
 629 +++ b/tests/addrscopes.c
 630 @@ -25,7 +25,7 @@
 631  #include <stdio_ext.h>
 632  #include <locale.h>
 633  #include <stdlib.h>
 634 -#include <error.h>
 635 +#include <err.h>
 636  #include <string.h>
 637
 638
 639 diff --git a/tests/allregs.c b/tests/allregs.c
 640 index 286f7e3..c9de089 100644
 641 --- a/tests/allregs.c
 642 +++ b/tests/allregs.c
 643 @@ -21,7 +21,7 @@
 644  #include <stdio.h>
 645  #include <stdlib.h>
 646  #include <string.h>
 647 -#include <error.h>
 648 +#include <err.h>
 649  #include <locale.h>
 650  #include <argp.h>
 651  #include <assert.h>
 652 diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c
 653 index a387d8f..955c27d 100644
 654 --- a/tests/backtrace-data.c
 655 +++ b/tests/backtrace-data.c
 656 @@ -27,7 +27,7 @@
 657  #include <dirent.h>
 658  #include <stdlib.h>
 659  #include <errno.h>
 660 -#include <error.h>
 661 +#include <err.h>
 662  #include <unistd.h>
 663  #include <dwarf.h>
 664  #if defined(__x86_64__) && defined(__linux__)
 665 diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c
 666 index 2dc8a9a..24ca7fb 100644
 667 --- a/tests/backtrace-dwarf.c
 668 +++ b/tests/backtrace-dwarf.c
 669 @@ -22,7 +22,7 @@
 670  #include <stdio_ext.h>
 671  #include <locale.h>
 672  #include <errno.h>
 673 -#include <error.h>
 674 +#include <err.h>
 675  #include <unistd.h>
 676  #include <sys/types.h>
 677  #include <sys/wait.h>
 678 diff --git a/tests/backtrace.c b/tests/backtrace.c
 679 index 21abe8a..d733248 100644
 680 --- a/tests/backtrace.c
 681 +++ b/tests/backtrace.c
 682 @@ -24,7 +24,7 @@
 683  #include <dirent.h>
 684  #include <stdlib.h>
 685  #include <errno.h>
 686 -#include <error.h>
 687 +#include <err.h>
 688  #include <unistd.h>
 689  #include <dwarf.h>
 690  #ifdef __linux__
 691 diff --git a/tests/buildid.c b/tests/buildid.c
 692 index 87c1877..2953e6b 100644
 693 --- a/tests/buildid.c
 694 +++ b/tests/buildid.c
 695 @@ -23,7 +23,7 @@
 696  #include ELFUTILS_HEADER(elf)
 697  #include ELFUTILS_HEADER(dwelf)
 698  #include <stdio.h>
 699 -#include <error.h>
 700 +#include <err.h>
 701  #include <string.h>
 702  #include <stdlib.h>
 703  #include <sys/types.h>
 704 diff --git a/tests/debugaltlink.c b/tests/debugaltlink.c
 705 index 6d97d50..ee7e559 100644
 706 --- a/tests/debugaltlink.c
 707 +++ b/tests/debugaltlink.c
 708 @@ -23,7 +23,7 @@
 709  #include ELFUTILS_HEADER(dw)
 710  #include ELFUTILS_HEADER(dwelf)
 711  #include <stdio.h>
 712 -#include <error.h>
 713 +#include <err.h>
 714  #include <string.h>
 715  #include <stdlib.h>
 716  #include <sys/types.h>
 717 diff --git a/tests/debuglink.c b/tests/debuglink.c
 718 index 935d102..741cb81 100644
 719 --- a/tests/debuglink.c
 720 +++ b/tests/debuglink.c
 721 @@ -21,7 +21,7 @@
 722  #include <errno.h>
 723  #include ELFUTILS_HEADER(dwelf)
 724  #include <stdio.h>
 725 -#include <error.h>
 726 +#include <err.h>
 727  #include <string.h>
 728  #include <stdlib.h>
 729  #include <sys/types.h>
 730 diff --git a/tests/deleted.c b/tests/deleted.c
 731 index 6be35bc..0190711 100644
 732 --- a/tests/deleted.c
 733 +++ b/tests/deleted.c
 734 @@ -21,7 +21,7 @@
 735  #include <unistd.h>
 736  #include <assert.h>
 737  #include <stdio.h>
 738 -#include <error.h>
 739 +#include <err.h>
 740  #include <errno.h>
 741  #ifdef __linux__
 742  #include <sys/prctl.h>
 743 diff --git a/tests/dwfl-addr-sect.c b/tests/dwfl-addr-sect.c
 744 index 21e470a..1ea1e3b 100644
 745 --- a/tests/dwfl-addr-sect.c
 746 +++ b/tests/dwfl-addr-sect.c
 747 @@ -23,7 +23,7 @@
 748  #include <stdio_ext.h>
 749  #include <stdlib.h>
 750  #include <string.h>
 751 -#include <error.h>
 752 +#include <err.h>
 753  #include <locale.h>
 754  #include <argp.h>
 755  #include ELFUTILS_HEADER(dwfl)
 756 diff --git a/tests/dwfl-bug-addr-overflow.c b/tests/dwfl-bug-addr-overflow.c
 757 index aa8030e..02c8bef 100644
 758 --- a/tests/dwfl-bug-addr-overflow.c
 759 +++ b/tests/dwfl-bug-addr-overflow.c
 760 @@ -20,7 +20,7 @@
 761  #include <inttypes.h>
 762  #include <stdio.h>
 763  #include <stdio_ext.h>
 764 -#include <error.h>
 765 +#include <err.h>
 766  #include <locale.h>
 767  #include ELFUTILS_HEADER(dwfl)
 768
 769 diff --git a/tests/dwfl-bug-fd-leak.c b/tests/dwfl-bug-fd-leak.c
 770 index 689cdd7..5973da3 100644
 771 --- a/tests/dwfl-bug-fd-leak.c
 772 +++ b/tests/dwfl-bug-fd-leak.c
 773 @@ -24,7 +24,7 @@
 774  #include <dirent.h>
 775  #include <stdlib.h>
 776  #include <errno.h>
 777 -#include <error.h>
 778 +#include <err.h>
 779  #include <unistd.h>
 780  #include <dwarf.h>
 781
 782 diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c
 783 index 1ee989f..fd62e65 100644
 784 --- a/tests/dwfl-bug-getmodules.c
 785 +++ b/tests/dwfl-bug-getmodules.c
 786 @@ -18,7 +18,7 @@
 787  #include <config.h>
 788  #include ELFUTILS_HEADER(dwfl)
 789
 790 -#include <error.h>
 791 +#include <err.h>
 792
 793  static const Dwfl_Callbacks callbacks =
 794    {
 795 diff --git a/tests/dwfl-report-elf-align.c b/tests/dwfl-report-elf-align.c
 796 index a4e97d3..f471587 100644
 797 --- a/tests/dwfl-report-elf-align.c
 798 +++ b/tests/dwfl-report-elf-align.c
 799 @@ -20,7 +20,7 @@
 800  #include <inttypes.h>
 801  #include <stdio.h>
 802  #include <stdio_ext.h>
 803 -#include <error.h>
 804 +#include <err.h>
 805  #include <locale.h>
 806  #include <string.h>
 807  #include <stdlib.h>
 808 diff --git a/tests/dwfllines.c b/tests/dwfllines.c
 809 index 90379dd..cbdf6c4 100644
 810 --- a/tests/dwfllines.c
 811 +++ b/tests/dwfllines.c
 812 @@ -27,7 +27,7 @@
 813  #include <stdio.h>
 814  #include <stdlib.h>
 815  #include <string.h>
 816 -#include <error.h>
 817 +#include <err.h>
 818
 819  int
 820  main (int argc, char *argv[])
 821 diff --git a/tests/dwflmodtest.c b/tests/dwflmodtest.c
 822 index 0027f96..e68d3bc 100644
 823 --- a/tests/dwflmodtest.c
 824 +++ b/tests/dwflmodtest.c
 825 @@ -23,7 +23,7 @@
 826  #include <stdio_ext.h>
 827  #include <stdlib.h>
 828  #include <string.h>
 829 -#include <error.h>
 830 +#include <err.h>
 831  #include <locale.h>
 832  #include <argp.h>
 833  #include ELFUTILS_HEADER(dwfl)
 834 diff --git a/tests/dwflsyms.c b/tests/dwflsyms.c
 835 index 49ac334..cf07830 100644
 836 --- a/tests/dwflsyms.c
 837 +++ b/tests/dwflsyms.c
 838 @@ -25,7 +25,7 @@
 839  #include <stdio.h>
 840  #include <stdio_ext.h>
 841  #include <stdlib.h>
 842 -#include <error.h>
 843 +#include <err.h>
 844  #include <string.h>
 845
 846  static const char *
 847 diff --git a/tests/early-offscn.c b/tests/early-offscn.c
 848 index 924cb9e..6f60d5a 100644
 849 --- a/tests/early-offscn.c
 850 +++ b/tests/early-offscn.c
 851 @@ -19,7 +19,7 @@
 852  #endif
 853
 854  #include <errno.h>
 855 -#include <error.h>
 856 +#include <err.h>
 857  #include <fcntl.h>
 858  #include <gelf.h>
 859  #include <stdio.h>
 860 diff --git a/tests/ecp.c b/tests/ecp.c
 861 index 38a6859..743cea5 100644
 862 --- a/tests/ecp.c
 863 +++ b/tests/ecp.c
 864 @@ -20,7 +20,7 @@
 865  #endif
 866
 867  #include <errno.h>
 868 -#include <error.h>
 869 +#include <err.h>
 870  #include <fcntl.h>
 871  #include <gelf.h>
 872  #include <stdlib.h>
 873 diff --git a/tests/find-prologues.c b/tests/find-prologues.c
 874 index ba8ae37..76f5f04 100644
 875 --- a/tests/find-prologues.c
 876 +++ b/tests/find-prologues.c
 877 @@ -25,7 +25,7 @@
 878  #include <stdio_ext.h>
 879  #include <locale.h>
 880  #include <stdlib.h>
 881 -#include <error.h>
 882 +#include <err.h>
 883  #include <string.h>
 884  #include <fnmatch.h>
 885
 886 diff --git a/tests/funcretval.c b/tests/funcretval.c
 887 index 8d19d11..c8aaa93 100644
 888 --- a/tests/funcretval.c
 889 +++ b/tests/funcretval.c
 890 @@ -25,7 +25,7 @@
 891  #include <stdio_ext.h>
 892  #include <locale.h>
 893  #include <stdlib.h>
 894 -#include <error.h>
 895 +#include <err.h>
 896  #include <string.h>
 897  #include <fnmatch.h>
 898
 899 diff --git a/tests/funcscopes.c b/tests/funcscopes.c
 900 index 9c90185..dbccb89 100644
 901 --- a/tests/funcscopes.c
 902 +++ b/tests/funcscopes.c
 903 @@ -25,7 +25,7 @@
 904  #include <stdio_ext.h>
 905  #include <locale.h>
 906  #include <stdlib.h>
 907 -#include <error.h>
 908 +#include <err.h>
 909  #include <string.h>
 910  #include <fnmatch.h>
 911
 912 diff --git a/tests/getsrc_die.c b/tests/getsrc_die.c
 913 index 055aede..9c394dd 100644
 914 --- a/tests/getsrc_die.c
 915 +++ b/tests/getsrc_die.c
 916 @@ -19,7 +19,7 @@
 917  #endif
 918
 919  #include <errno.h>
 920 -#include <error.h>
 921 +#include <err.h>
 922  #include <fcntl.h>
 923  #include <inttypes.h>
 924  #include <libelf.h>
 925 diff --git a/tests/line2addr.c b/tests/line2addr.c
 926 index e0d65d3..9bf0023 100644
 927 --- a/tests/line2addr.c
 928 +++ b/tests/line2addr.c
 929 @@ -26,7 +26,7 @@
 930  #include <locale.h>
 931  #include <stdlib.h>
 932  #include <string.h>
 933 -#include <error.h>
 934 +#include <err.h>
 935
 936
 937  static void
 938 diff --git a/tests/low_high_pc.c b/tests/low_high_pc.c
 939 index d0f4302..8da4fbd 100644
 940 --- a/tests/low_high_pc.c
 941 +++ b/tests/low_high_pc.c
 942 @@ -25,7 +25,7 @@
 943  #include <stdio_ext.h>
 944  #include <locale.h>
 945  #include <stdlib.h>
 946 -#include <error.h>
 947 +#include <err.h>
 948  #include <string.h>
 949  #include <fnmatch.h>
 950
 951 diff --git a/tests/md5-sha1-test.c b/tests/md5-sha1-test.c
 952 index d50355e..3c41f40 100644
 953 --- a/tests/md5-sha1-test.c
 954 +++ b/tests/md5-sha1-test.c
 955 @@ -19,7 +19,7 @@
 956  #endif
 957
 958  #include <string.h>
 959 -#include <error.h>
 960 +#include <err.h>
 961
 962  #include "md5.h"
 963  #include "sha1.h"
 964 diff --git a/tests/rdwrmmap.c b/tests/rdwrmmap.c
 965 index 6f027df..1ce5e6e 100644
 966 --- a/tests/rdwrmmap.c
 967 +++ b/tests/rdwrmmap.c
 968 @@ -19,7 +19,7 @@
 969  #endif
 970
 971  #include <errno.h>
 972 -#include <error.h>
 973 +#include <err.h>
 974  #include <stdio.h>
 975  #include <fcntl.h>
 976  #include <unistd.h>
 977 diff --git a/tests/saridx.c b/tests/saridx.c
 978 index 8a450d8..b387801 100644
 979 --- a/tests/saridx.c
 980 +++ b/tests/saridx.c
 981 @@ -17,7 +17,7 @@
 982
 983  #include <config.h>
 984
 985 -#include <error.h>
 986 +#include <err.h>
 987  #include <fcntl.h>
 988  #include <gelf.h>
 989  #include <stdio.h>
 990 diff --git a/tests/sectiondump.c b/tests/sectiondump.c
 991 index 3033fed..8e888db 100644
 992 --- a/tests/sectiondump.c
 993 +++ b/tests/sectiondump.c
 994 @@ -18,7 +18,7 @@
 995  #include <config.h>
 996
 997  #include <errno.h>
 998 -#include <error.h>
 999 +#include <err.h>
1000  #include <fcntl.h>
1001  #include <gelf.h>
1002  #include <inttypes.h>
1003 diff --git a/tests/varlocs.c b/tests/varlocs.c
1004 index c3fba89..e043ea2 100644
1005 --- a/tests/varlocs.c
1006 +++ b/tests/varlocs.c
1007 @@ -25,7 +25,7 @@
1008  #include <dwarf.h>
1009  #include <stdio.h>
1010  #include <stdlib.h>
1011 -#include <error.h>
1012 +#include <err.h>
1013  #include <string.h>
1014  #include <sys/types.h>
1015  #include <sys/stat.h>
1016 diff --git a/tests/vdsosyms.c b/tests/vdsosyms.c
1017 index b876c10..afb2823 100644
1018 --- a/tests/vdsosyms.c
1019 +++ b/tests/vdsosyms.c
1020 @@ -18,7 +18,7 @@
1021  #include <config.h>
1022  #include <assert.h>
1023  #include <errno.h>
1024 -#include <error.h>
1025 +#include <err.h>
1026  #include <inttypes.h>
1027  #include <stdio.h>
1028  #include <string.h>
1029 --
1030 1.8.3.1
1031