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

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