diff options
| author | Sergey V. Lobanov <sergey@lobanov.in> | 2022-01-04 17:22:07 +0300 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-01-08 00:49:59 +0100 |
| commit | 6835ea13f0fa2c3a6036e2af7d6f52839cf93d9a (patch) | |
| tree | 36210f833fe989f358e303001ac7437b6e25e898 /package/libs/elfutils/patches/100-musl-compat.patch | |
| parent | e0a574d4b73b6444d493866128cf3be3fae10892 (diff) | |
| download | upstream-6835ea13f0fa2c3a6036e2af7d6f52839cf93d9a.tar.gz upstream-6835ea13f0fa2c3a6036e2af7d6f52839cf93d9a.tar.bz2 upstream-6835ea13f0fa2c3a6036e2af7d6f52839cf93d9a.zip | |
elfutils: update to 0.186
Upstreamed patches (deleted):
0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch -
https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=8382833a257b57b0d288be07d2d5e7af6c102869
110-no-cdefs.patch -
https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=d390548df1942e98a1d836269a5e41ba52e121f1
Auto-refreshed:
006-Fix-build-on-aarch64-musl.patch
101-no-fts.patch
Manually updated and refreshed:
005-build_only_libs.patch
003-libintl-compatibility.patch
100-musl-compat.patch
Disabled _obstack_free check (via configure vars)
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
Diffstat (limited to 'package/libs/elfutils/patches/100-musl-compat.patch')
| -rw-r--r-- | package/libs/elfutils/patches/100-musl-compat.patch | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/package/libs/elfutils/patches/100-musl-compat.patch b/package/libs/elfutils/patches/100-musl-compat.patch index 508ff9e946..52b9f2c43b 100644 --- a/package/libs/elfutils/patches/100-musl-compat.patch +++ b/package/libs/elfutils/patches/100-musl-compat.patch @@ -1,27 +1,3 @@ -https://sourceware.org/bugzilla/show_bug.cgi?id=21002 - ---- a/lib/system.h -+++ b/lib/system.h -@@ -30,7 +30,18 @@ - #define LIB_SYSTEM_H 1 - - #include <errno.h> --#include <error.h> -+#ifdef HAVE_ERROR_H -+#include "error.h" -+#else -+#include "err.h" -+#include <stdio.h> -+#define error(status, errno, ...) \ -+ do { \ -+ fflush(stdout); \ -+ warn(__VA_ARGS__); \ -+ if (status) exit(status); \ -+ } while(0) -+#endif - #include <stddef.h> - #include <stdint.h> - #include <sys/param.h> --- a/libdw/libdw_alloc.c +++ b/libdw/libdw_alloc.c @@ -152,5 +152,5 @@ __attribute ((noreturn)) attribute_hidde @@ -33,15 +9,21 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=21002 } --- a/libdwfl/dwfl_error.c +++ b/libdwfl/dwfl_error.c -@@ -154,7 +154,11 @@ dwfl_errmsg (int error) - switch (error &~ 0xffff) - { - case OTHER_ERROR (ERRNO): +@@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error) + static const char * + errnomsg(int error) + { +#if defined(__GLIBC__) && !defined(__UCLIBC__) - return strerror_r (error & 0xffff, "bad", 0); + /* Won't be changed by strerror_r, but not const so compiler doesn't throw warning */ + static char unknown[] = "unknown error"; + +@@ -150,6 +151,9 @@ errnomsg(int error) + static __thread char msg[128]; + return strerror_r (error, msg, sizeof (msg)) ? unknown : msg; + #endif +#else -+ return strerror (error & 0xffff); ++ return strerror (error & 0xffff); +#endif - case OTHER_ERROR (LIBELF): - return elf_errmsg (error & 0xffff); - case OTHER_ERROR (LIBDW): + } + + const char * |