commit:     606fc6607c242f1fe91b655f4525b6b5c3cbf794
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 04:12:30 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 04:12:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=606fc660

dev-libs/elfutils: 0.176 with portability fixes from voidlinux

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 dev-libs/elfutils/Manifest                         |   1 +
 dev-libs/elfutils/elfutils-0.176.ebuild            |  78 ++++
 .../files/elfutils-0.176-portability-fixes.patch   | 414 +++++++++++++++++++++
 3 files changed, 493 insertions(+)

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 3fdccde..37dfc30 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,3 +1,4 @@
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 
03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06
 SHA512 
aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 
7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce
 SHA512 
b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B 
c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb
 SHA512 
7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
+DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 
7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794
 SHA512 
7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b

diff --git a/dev-libs/elfutils/elfutils-0.176.ebuild 
b/dev-libs/elfutils/elfutils-0.176.ebuild
new file mode 100644
index 0000000..e80e341
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.176.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement 
for libelf)"
+HOMEPAGE="http://elfutils.org/";
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2";
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+       !dev-libs/libelf"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )
+       >=sys-devel/flex-2.5.4a
+       sys-devel/m4
+       elibc_musl? (
+               sys-libs/argp-standalone
+               sys-libs/fts-standalone
+               sys-libs/obstack-standalone
+       )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.118-PaX-support.patch
+       "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+       "${FILESDIR}"/${PN}-0.176-portability-fixes.patch
+)
+
+src_prepare() {
+       default
+
+       eautoreconf
+
+       if ! use static-libs; then
+               sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' 
lib{asm,dw,elf}/Makefile.in || die
+       fi
+       # https://sourceware.org/PR23914
+       sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+       use test && append-flags -g #407135
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" econf \
+               $(use_enable nls) \
+               $(use_enable threads thread-safety) \
+               --program-prefix="eu-" \
+               --with-zlib \
+               $(use_with bzip2 bzlib) \
+               $(use_with lzma)
+}
+
+multilib_src_test() {
+       env     
LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm"
 \
+               LC_ALL="C" \
+               emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       dodoc NOTES
+       # These build quick, and are needed for most tests, so don't
+       # disable their building when the USE flag is disabled.
+       if ! use utils; then
+               rm -rf "${ED}"/usr/bin || die
+       fi
+}

diff --git a/dev-libs/elfutils/files/elfutils-0.176-portability-fixes.patch 
b/dev-libs/elfutils/files/elfutils-0.176-portability-fixes.patch
new file mode 100644
index 0000000..f573f76
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.176-portability-fixes.patch
@@ -0,0 +1,414 @@
+From de94a67137e483db97efd40e7d13f0148e43e95c Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anar...@gentoo.org>
+Date: Thu, 11 Apr 2019 22:58:38 -0500
+Subject: [PATCH] portability fixes
+
+---
+ configure.ac         | 56 ++++++++++++++++++++++++++++++++++++++++++++
+ lib/error.h          | 27 +++++++++++++++++++++
+ lib/fixedsizehash.h  |  1 -
+ libdw/Makefile.am    |  2 +-
+ libdwfl/dwfl_error.c |  9 +++++++
+ libelf/elf.h         | 11 +++++++++
+ src/Makefile.am      | 28 +++++++++++-----------
+ src/arlib.h          | 10 ++++++++
+ src/elfcompress.c    |  8 +++++++
+ src/error.h          | 27 +++++++++++++++++++++
+ src/readelf.c        | 21 ++++++++++-------
+ src/strip.c          |  8 +++++++
+ src/unstrip.c        |  9 +++++++
+ 13 files changed, 192 insertions(+), 25 deletions(-)
+ create mode 100644 lib/error.h
+ create mode 100644 src/error.h
+
+diff --git a/configure.ac b/configure.ac
+index b4e012d..27e6152 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -494,6 +494,62 @@ else
+ fi
+ AC_SUBST([argp_LDADD])
+ 
++dnl Check if we have fts available from our libc
++AC_LINK_IFELSE(
++      [AC_LANG_PROGRAM(
++              [#if !defined(__x86_64__)
++              #undef  _FILE_OFFSET_BITS
++              #define _FILE_OFFSET_BITS 32
++              #endif
++              #include <fts.h>],
++              [FTS* fts = 0; return fts_close(fts); return 0;]
++              )],
++      [libc_has_fts="true"],
++      [libc_has_fts="false"]
++)
++
++dnl If our libc doesn't provide fts, then test for libfts
++if test "$libc_has_fts" = "false" ; then
++      AC_MSG_WARN("libc does not have fts")
++      AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
++
++      if test "$have_fts" = "false"; then
++              AC_MSG_ERROR("no libfts found")
++      else
++              fts_LDADD="-lfts"
++      fi
++else
++      fts_LDADD=""
++fi
++AC_SUBST([fts_LDADD])
++
++dnl Check if we have obstack available from our libc
++AC_LINK_IFELSE(
++      [AC_LANG_PROGRAM(
++              [#include <obstack.h>],
++              [_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
++              )],
++      [libc_has_obstack="true"],
++      [libc_has_obstack="false"]
++)
++
++dnl If our libc doesn't provide obstack, then test for libobstack
++if test "$libc_has_obstack" = "false" ; then
++      AC_MSG_WARN("libc does not have obstack")
++      AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], 
[have_obstack="false"])
++
++      if test "$have_obstack" = "false"; then
++              AC_MSG_ERROR("no libobstack found")
++      else
++              obstack_LDADD="-lobstack"
++      fi
++else
++      obstack_LDADD=""
++fi
++AC_SUBST([obstack_LDADD])
++
++dnl The directories with content.
++
+ dnl The directories with content.
+ 
+ dnl Documentation.
+diff --git a/lib/error.h b/lib/error.h
+new file mode 100644
+index 0000000..ef06827
+--- /dev/null
++++ b/lib/error.h
+@@ -0,0 +1,27 @@
++#ifndef _ERROR_H_
++#define _ERROR_H_
++
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++      va_list ap;
++      fprintf(stderr, "%s: ", program_invocation_name);
++      va_start(ap, format);
++      vfprintf(stderr, format, ap);
++      va_end(ap);
++      if (errnum)
++              fprintf(stderr, ": %s", strerror(errnum));
++      fprintf(stderr, "\n");
++      error_message_count++;
++      if (status)
++              exit(status);
++}
++
++#endif        /* _ERROR_H_ */
+diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
+index dac2a5f..43016fc 100644
+--- a/lib/fixedsizehash.h
++++ b/lib/fixedsizehash.h
+@@ -30,7 +30,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/cdefs.h>
+ 
+ #include <system.h>
+ 
+diff --git a/libdw/Makefile.am b/libdw/Makefile.am
+index 7a3d532..646fbd0 100644
+--- a/libdw/Makefile.am
++++ b/libdw/Makefile.am
+@@ -108,7 +108,7 @@ 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
+-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)
++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD) $(zip_LIBS)
+ 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/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
+index 7bcf61c..ff25ebb 100644
+--- a/libdwfl/dwfl_error.c
++++ b/libdwfl/dwfl_error.c
+@@ -154,7 +154,16 @@ dwfl_errmsg (int error)
+   switch (error &~ 0xffff)
+     {
+     case OTHER_ERROR (ERRNO):
++#if defined(__GLIBC__)
+       return strerror_r (error & 0xffff, "bad", 0);
++#else
++      {
++        static __thread char buf[128] = "";
++        if (0 == strerror_r(error & 0xffff, buf, sizeof(buf)))
++          return buf;
++      }
++      return "strerror_r() failed";
++#endif
+     case OTHER_ERROR (LIBELF):
+       return elf_errmsg (error & 0xffff);
+     case OTHER_ERROR (LIBDW):
+diff --git a/libelf/elf.h b/libelf/elf.h
+index 75043bc..da1598a 100644
+--- a/libelf/elf.h
++++ b/libelf/elf.h
+@@ -21,6 +21,17 @@
+ 
+ #include <features.h>
+ 
++#if !defined(__GLIBC__)
++/* C++ needs to know that types and declarations are C, not C++.  */
++#ifdef  __cplusplus
++# define __BEGIN_DECLS  extern "C" {
++# define __END_DECLS    }
++#else
++# define __BEGIN_DECLS
++# define __END_DECLS
++#endif
++#endif
++
+ __BEGIN_DECLS
+ 
+ /* Standard ELF types.  */
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2b1c0dc..ad05977 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -67,22 +67,22 @@ ranlib_no_Wstack_usage = yes
+ ar_no_Wstack_usage = yes
+ unstrip_no_Wstack_usage = yes
+ 
+-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
+-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \
++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) 
$(fts_LDADD) $(obstack_LDADD) -ldl
++nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD) -ldl \
+          $(demanglelib)
+-size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
+-strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
+-elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
+-findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
+-addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
+-elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
++size_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
++strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) 
$(fts_LDADD) $(obstack_LDADD) -ldl
++elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD) -ldl
++findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD)
++addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD) $(demanglelib)
++elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD) -ldl
+ objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
+-ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
+-strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
+-ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
+-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
+-stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl 
$(demanglelib)
+-elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD)
++strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
++ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) 
$(obstack_LDADD)
++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) 
$(fts_LDADD) $(obstack_LDADD) -ldl
++stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) 
$(fts_LDADD) $(obstack_LDADD) -ldl $(demanglelib)
++elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) 
$(fts_LDADD) $(obstack_LDADD)
+ 
+ installcheck-binPROGRAMS: $(bin_PROGRAMS)
+       bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
+diff --git a/src/arlib.h b/src/arlib.h
+index e117166..c66a5c9 100644
+--- a/src/arlib.h
++++ b/src/arlib.h
+@@ -29,6 +29,16 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(ACCESSPERMS)
++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
++#endif
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 
*/
++#endif
++#if !defined(DEFFILEMODE)
++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 
0666*/
++#endif
++
+ 
+ /* State of -D/-U flags.  */
+ extern bool arlib_deterministic_output;
+diff --git a/src/elfcompress.c b/src/elfcompress.c
+index 6ba6af4..f7d032b 100644
+--- a/src/elfcompress.c
++++ b/src/elfcompress.c
+@@ -37,6 +37,14 @@
+ #include "libeu.h"
+ #include "printversion.h"
+ 
++#if !defined(FNM_EXTMATCH)
++# define FNM_EXTMATCH 0
++#endif
++
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 
*/
++#endif
++
+ /* Name and version of program.  */
+ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
+ 
+diff --git a/src/error.h b/src/error.h
+new file mode 100644
+index 0000000..ef06827
+--- /dev/null
++++ b/src/error.h
+@@ -0,0 +1,27 @@
++#ifndef _ERROR_H_
++#define _ERROR_H_
++
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++      va_list ap;
++      fprintf(stderr, "%s: ", program_invocation_name);
++      va_start(ap, format);
++      vfprintf(stderr, format, ap);
++      va_end(ap);
++      if (errnum)
++              fprintf(stderr, ": %s", strerror(errnum));
++      fprintf(stderr, "\n");
++      error_message_count++;
++      if (status)
++              exit(status);
++}
++
++#endif        /* _ERROR_H_ */
+diff --git a/src/readelf.c b/src/readelf.c
+index 33706bd..da6624b 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -4792,10 +4792,11 @@ listptr_base (struct listptr *p)
+   return cudie_base (&cu);
+ }
+ 
++static const char *listptr_name;
++
+ static int
+-compare_listptr (const void *a, const void *b, void *arg)
++compare_listptr (const void *a, const void *b)
+ {
+-  const char *name = arg;
+   struct listptr *p1 = (void *) a;
+   struct listptr *p2 = (void *) b;
+ 
+@@ -4811,21 +4812,21 @@ compare_listptr (const void *a, const void *b, void 
*arg)
+         p1->warned = p2->warned = true;
+         error (0, 0,
+                gettext ("%s %#" PRIx64 " used with different address sizes"),
+-               name, (uint64_t) p1->offset);
++               listptr_name, (uint64_t) p1->offset);
+       }
+       if (p1->dwarf64 != p2->dwarf64)
+       {
+         p1->warned = p2->warned = true;
+         error (0, 0,
+                gettext ("%s %#" PRIx64 " used with different offset sizes"),
+-               name, (uint64_t) p1->offset);
++               listptr_name, (uint64_t) p1->offset);
+       }
+       if (listptr_base (p1) != listptr_base (p2))
+       {
+         p1->warned = p2->warned = true;
+         error (0, 0,
+                gettext ("%s %#" PRIx64 " used with different base addresses"),
+-               name, (uint64_t) p1->offset);
++               listptr_name, (uint64_t) p1->offset);
+       }
+       if (p1->attr != p2 ->attr)
+       {
+@@ -4833,7 +4834,7 @@ compare_listptr (const void *a, const void *b, void *arg)
+         error (0, 0,
+                gettext ("%s %#" PRIx64
+                         " used with different attribute %s and %s"),
+-               name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
++               listptr_name, (uint64_t) p1->offset, dwarf_attr_name 
(p2->attr),
+                dwarf_attr_name (p2->attr));
+       }
+     }
+@@ -4904,9 +4905,11 @@ notice_listptr (enum section_e section, struct 
listptr_table *table,
+ static void
+ sort_listptr (struct listptr_table *table, const char *name)
+ {
+-  if (table->n > 0)
+-    qsort_r (table->table, table->n, sizeof table->table[0],
+-           &compare_listptr, (void *) name);
++  if (table->n > 0) {
++    listptr_name = name;
++    qsort (table->table, table->n, sizeof table->table[0],
++           &compare_listptr);
++  }
+ }
+ 
+ static bool
+diff --git a/src/strip.c b/src/strip.c
+index a73009d..c6ed590 100644
+--- a/src/strip.c
++++ b/src/strip.c
+@@ -46,6 +46,14 @@
+ #include <system.h>
+ #include <printversion.h>
+ 
++#if !defined(FNM_EXTMATCH)
++# define FNM_EXTMATCH 0
++#endif
++
++#if !defined(ACCESSPERMS)
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ typedef uint8_t GElf_Byte;
+ 
+ /* Name and version of program.  */
+diff --git a/src/unstrip.c b/src/unstrip.c
+index 3495b1d..0754717 100644
+--- a/src/unstrip.c
++++ b/src/unstrip.c
+@@ -56,6 +56,15 @@
+ # define _(str) gettext (str)
+ #endif
+ 
++#ifndef strndupa
++#define strndupa(s, n) \
++       (__extension__ ({const char *__in = (s);                    \
++                        size_t __len = strnlen (__in, (n)) + 1;    \
++                        char *__out = (char *) alloca (__len);     \
++                        __out[__len-1] = '\0';                     \
++                        (char *) memcpy (__out, __in, __len-1);}))
++#endif
++
+ /* Name and version of program.  */
+ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
+ 
+-- 
+2.21.0
+

Reply via email to