--- /dev/null
+Allow the usage of an external implementation of the argp functions
+
+uClibc lack the argp family of functions that glibc has. Therefore, we
+add a check in the configure script to see if argp_parse is available
+in the C library. If not, we look if it is available in the additional
+'argp' library. If so, we link against that library. If not, we error
+out.
+
+This allows to build elfutils against uClibc with an external argp
+library.
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/configure.ac b/configure.ac
+--- a/configure.ac 2015-01-06 11:30:02.170052875 +0000
++++ b/configure.ac 2015-01-06 11:31:10.122219826 +0000
+@@ -253,6 +253,13 @@ AC_SUBST([LIBEBL_SUBDIR])
+ AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
+ AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
+
++AC_CHECK_FUNC([argp_parse])
++if test "$ac_cv_func_argp_parse" != yes; then
++ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
++ AC_MSG_ERROR([No argp_parse function available.]))
++fi
++AC_SUBST(ARGP_LIBS)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+diff -rup a/libdw/Makefile.am b/libdw/Makefile.am
+--- a/libdw/Makefile.am 2014-12-19 20:43:11.000000000 +0000
++++ b/libdw/Makefile.am 2015-01-06 11:32:21.075438524 +0000
+@@ -112,7 +112,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
+ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
+ -Wl,--version-script,$<,--no-undefined \
+ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+- -ldl $(zip_LIBS)
++ -ldl $(zip_LIBS) $(ARGP_LIBS)
+ @$(textrel_check)
+ ln -fs $@ $@.$(VERSION)
+
+diff -rup a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am 2015-01-06 11:30:02.430057339 +0000
++++ b/src/Makefile.am 2015-01-06 11:34:53.061049752 +0000
+@@ -94,27 +94,29 @@ readelf_no_Werror = yes
+ strings_no_Werror = yes
+ addr2line_no_Wformat = yes
+
+-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
+ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
+- $(demanglelib)
+-size_LDADD = $(libelf) $(libeu)
+-strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl
+-ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl
++ $(demanglelib) $(ARGP_LIBS)
++size_LDADD = $(libelf) $(libeu) $(ARGP_LIBS)
++strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
++ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
+ if NATIVE_LD
+ # -ldl is always needed for libebl.
+ ld_LDADD += libld_elf.a
+ endif
+ ld_LDFLAGS = -rdynamic
+-elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl
+-findtextrel_LDADD = $(libdw) $(libelf)
+-addr2line_LDADD = $(libdw) $(libelf)
+-elfcmp_LDADD = $(libebl) $(libelf) -ldl
+-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl
+-ranlib_LDADD = libar.a $(libelf) $(libeu)
+-strings_LDADD = $(libelf) $(libeu)
+-ar_LDADD = libar.a $(libelf) $(libeu)
+-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl
+-stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(demanglelib)
++elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
++findtextrel_LDADD = $(libdw) $(libelf) $(ARGP_LIBS)
++addr2line_LDADD = $(libdw) $(libelf) $(ARGP_LIBS)
++elfcmp_LDADD = $(libebl) $(libelf) -ldl $(ARGP_LIBS)
++objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl \
++ $(ARGP_LIBS)
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS)
++strings_LDADD = $(libelf) $(libeu) $(ARGP_LIBS)
++ar_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS)
++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(ARGP_LIBS)
++stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl \
++ $(demanglelib) $(ARGP_LIBS)
+
+ ldlex.o: ldscript.c
+ ldlex_no_Werror = yes
+++ /dev/null
-Fetched from https://fedorahosted.org/releases/e/l/elfutils/0.160/elfutils-portability.patch
-This changes among versions but doesn't switch name so it's bad to make
-it an automatic download.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- elfutils/backends/ChangeLog
-+++ elfutils/backends/ChangeLog
-@@ -413,6 +413,10 @@
- * ppc_attrs.c (ppc_check_object_attribute): Handle tag
- GNU_Power_ABI_Struct_Return.
-
-+2009-01-23 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
-+
- 2008-10-04 Ulrich Drepper <drepper@redhat.com>
-
- * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -740,6 +744,11 @@
- * sparc_init.c: Likewise.
- * x86_64_init.c: Likewise.
-
-+2005-11-22 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
-+ (libebl_%.so rule): Use it in place of -Wl,--as-needed.
-+
- 2005-11-19 Roland McGrath <roland@redhat.com>
-
- * ppc64_reloc.def: REL30 -> ADDR30.
-@@ -762,6 +771,9 @@
- * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
- (CLEANFILES): Add libebl_$(m).so.
-
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
- * ppc64_reloc.def: Likewise.
-
---- elfutils/backends/Makefile.am
-+++ elfutils/backends/Makefile.am
-@@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- $(LINK) -shared -o $(@:.map=.so) \
- -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- -Wl,--version-script,$(@:.so=.map) \
-- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
-+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- $(textrel_check)
-
- libebl_i386.so: $(cpu_i386)
---- elfutils/backends/Makefile.in
-+++ elfutils/backends/Makefile.in
-@@ -83,6 +83,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = backends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -285,6 +286,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -316,6 +318,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -378,11 +381,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
- -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \
- libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS))
-@@ -885,7 +888,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- $(LINK) -shared -o $(@:.map=.so) \
- -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- -Wl,--version-script,$(@:.so=.map) \
-- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
-+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- $(textrel_check)
-
- libebl_i386.so: $(cpu_i386)
---- elfutils/ChangeLog
-+++ elfutils/ChangeLog
-@@ -170,6 +170,8 @@
-
- 2012-01-24 Mark Wielaard <mjw@redhat.com>
-
-+ * configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.
-+
- * COPYING: Fix address. Updated version from gnulib.
-
- 2012-01-23 Mark Wielaard <mjw@redhat.com>
-@@ -188,6 +190,9 @@
-
- 2011-10-08 Mike Frysinger <vapier@gentoo.org>
-
-+ * configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR
-+ automake option.
-+
- * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
-
- 2011-10-02 Ulrich Drepper <drepper@gmail.com>
-@@ -209,6 +214,10 @@
-
- * configure.ac (LOCALEDIR, DATADIRNAME): Removed.
-
-+2009-11-22 Roland McGrath <roland@redhat.com>
-+
-+ * configure.ac: Use sed and expr instead of modern bash extensions.
-+
- 2009-09-21 Ulrich Drepper <drepper@redhat.com>
-
- * configure.ac: Update for more modern autoconf.
-@@ -217,6 +226,10 @@
-
- * configure.ac (zip_LIBS): Check for liblzma too.
-
-+2009-08-17 Roland McGrath <roland@redhat.com>
-+
-+ * configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
-+
- 2009-04-19 Roland McGrath <roland@redhat.com>
-
- * configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -228,6 +241,8 @@
-
- 2009-01-23 Roland McGrath <roland@redhat.com>
-
-+ * configure.ac: Check for __builtin_popcount.
-+
- * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
-
- * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -308,6 +323,10 @@
- * configure.ac: Add dummy automake conditional to get dependencies
- for non-generic linker right. See src/Makefile.am.
-
-+2005-11-22 Roland McGrath <roland@redhat.com>
-+
-+ * configure.ac: Check for --as-needed linker option.
-+
- 2005-11-18 Roland McGrath <roland@redhat.com>
-
- * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -355,6 +374,17 @@
- * Makefile.am (all_SUBDIRS): Add libdwfl.
- * configure.ac: Write libdwfl/Makefile.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
-+
-+ * configure.ac: Check for struct stat st_?tim members.
-+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.
-+
-+ * configure.ac: Check for futimes function.
-+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
-+ (handle_ar) [! HAVE_FUTIMES]: Likewise.
-+
- 2005-05-19 Roland McGrath <roland@redhat.com>
-
- * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
---- elfutils/config/ChangeLog
-+++ elfutils/config/ChangeLog
-@@ -62,6 +62,10 @@
-
- * known-dwarf.awk: Use gawk.
-
-+2011-10-08 Mike Frysinger <vapier@gentoo.org>
-+
-+ * eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.
-+
- 2010-07-02 Ulrich Drepper <drepper@redhat.com>
-
- * elfutils.spec.in: Add more BuildRequires.
---- elfutils/config/eu.am
-+++ elfutils/config/eu.am
-@@ -1,6 +1,6 @@
- ## Common automake fragments for elfutils subdirectory makefiles.
- ##
--## Copyright (C) 2010, 2014 Red Hat, Inc.
-+## Copyright (C) 2010-2011, 2014 Red Hat, Inc.
- ##
- ## This file is part of elfutils.
- ##
-@@ -29,13 +29,21 @@
- ## not, see <http://www.gnu.org/licenses/>.
- ##
-
-+WEXTRA = @WEXTRA@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
-+
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
-+ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
- $($(*F)_CFLAGS)
-
-+if BUILD_WERROR
-+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)
-+endif
-+
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
-
- %.os: %.c %.o
---- elfutils/config/Makefile.in
-+++ elfutils/config/Makefile.in
-@@ -146,6 +146,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -177,6 +178,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/config.h.in
-+++ elfutils/config.h.in
-@@ -3,6 +3,9 @@
- /* Should ar and ranlib use -D behavior by default? */
- #undef DEFAULT_AR_DETERMINISTIC
-
-+/* Have __builtin_popcount. */
-+#undef HAVE_BUILTIN_POPCOUNT
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-@@ -102,4 +105,7 @@
- /* Define for large files, on AIX-style hosts. */
- #undef _LARGE_FILES
-
-+/* Stubbed out if missing compiler support. */
-+#undef __thread
-+
- #include <eu-config.h>
---- elfutils/configure
-+++ elfutils/configure
-@@ -661,6 +661,8 @@ ZLIB_TRUE
- LIBEBL_SUBDIR
- TESTS_RPATH_FALSE
- TESTS_RPATH_TRUE
-+BUILD_WERROR_FALSE
-+BUILD_WERROR_TRUE
- BUILD_STATIC_FALSE
- BUILD_STATIC_TRUE
- USE_VALGRIND_FALSE
-@@ -676,6 +678,8 @@ NEVER_TRUE
- base_cpu
- NATIVE_LD_FALSE
- NATIVE_LD_TRUE
-+LD_AS_NEEDED
-+WEXTRA
- NM
- READELF
- ac_ct_AR
-@@ -796,6 +800,7 @@ enable_debugpred
- enable_gprof
- enable_gcov
- enable_valgrind
-+enable_werror
- enable_tests_rpath
- enable_libebl_subdir
- with_zlib
-@@ -1452,6 +1457,7 @@ Optional Features:
- --enable-gprof build binaries with gprof support
- --enable-gcov build binaries with gcov support
- --enable-valgrind run all tests under valgrind
-+ --disable-werror do not build with -Werror
- --enable-tests-rpath build $ORIGIN-using rpath into tests
- --enable-libebl-subdir=DIR
- install libebl_CPU modules in $(libdir)/DIR
-@@ -4728,6 +4734,130 @@ if test "x$ac_cv_c99" != xyes; then :
- as_fn_error $? "gcc with C99 support required" "$LINENO" 5
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
-+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
-+if ${ac_cv_cc_wextra+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+void foo (void) { }
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_cc_wextra=yes
-+else
-+ ac_cv_cc_wextra=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
-+$as_echo "$ac_cv_cc_wextra" >&6; }
-+
-+if test "x$ac_cv_cc_wextra" = xyes; then :
-+ WEXTRA=-Wextra
-+else
-+ WEXTRA=-W
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
-+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
-+if ${ac_cv_cc_gnu89_inline+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+void foo (void)
-+{
-+ inline void bar (void) {}
-+ bar ();
-+}
-+extern inline void baz (void) {}
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_cc_gnu89_inline=yes
-+else
-+ ac_cv_cc_gnu89_inline=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
-+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
-+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
-+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
-+$as_echo_n "checking for --as-needed linker option... " >&6; }
-+if ${ac_cv_as_needed+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+ -fPIC -shared -o conftest.so conftest.c
-+ -Wl,--as-needed 1>&5'
-+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }
-+then
-+ ac_cv_as_needed=yes
-+else
-+ ac_cv_as_needed=no
-+fi
-+rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
-+$as_echo "$ac_cv_as_needed" >&6; }
-+if test "x$ac_cv_as_needed" = xyes; then :
-+ LD_AS_NEEDED=-Wl,--as-needed
-+else
-+ LD_AS_NEEDED=
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
-+$as_echo_n "checking for __builtin_popcount... " >&6; }
-+if ${ac_cv_popcount+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+exit (__builtin_popcount (127));
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_popcount=yes
-+else
-+ ac_cv_popcount=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
-+$as_echo "$ac_cv_popcount" >&6; }
-+if test "x$ac_cv_popcount" = xyes; then :
-+
-+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
- $as_echo_n "checking for __thread support... " >&6; }
- if ${ac_cv_tls+:} false; then :
-@@ -4764,7 +4894,13 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
- $as_echo "$ac_cv_tls" >&6; }
- if test "x$ac_cv_tls" != xyes; then :
-- as_fn_error $? "__thread support required" "$LINENO" 5
-+ if test "$use_locks" = yes; then :
-+ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
-+else
-+
-+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
-+
-+fi
- fi
-
- # Check whether --enable-largefile was given.
-@@ -5131,6 +5267,22 @@ else
- fi
-
-
-+# Check whether --enable-werror was given.
-+if test "${enable_werror+set}" = set; then :
-+ enableval=$enable_werror; enable_werror=$enableval
-+else
-+ enable_werror=yes
-+fi
-+
-+ if test "$enable_werror" = yes; then
-+ BUILD_WERROR_TRUE=
-+ BUILD_WERROR_FALSE='#'
-+else
-+ BUILD_WERROR_TRUE='#'
-+ BUILD_WERROR_FALSE=
-+fi
-+
-+
- # Check whether --enable-tests-rpath was given.
- if test "${enable_tests_rpath+set}" = set; then :
- enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5854,7 +6006,7 @@ case "$eu_version" in
- esac
-
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6600,6 +6752,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
- as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
-+ as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
- as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
---- elfutils/configure.ac
-+++ elfutils/configure.ac
-@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"])
- AS_IF([test "x$ac_cv_c99" != xyes],
- AC_MSG_ERROR([gcc with C99 support required]))
-
-+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],
-+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
-+CFLAGS="$old_CFLAGS"])
-+AC_SUBST(WEXTRA)
-+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
-+
-+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+void foo (void)
-+{
-+ inline void bar (void) {}
-+ bar ();
-+}
-+extern inline void baz (void) {}
-+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
-+CFLAGS="$old_CFLAGS"])
-+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
-+ [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
-+
-+AC_CACHE_CHECK([for --as-needed linker option],
-+ ac_cv_as_needed, [dnl
-+cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+ -fPIC -shared -o conftest.so conftest.c
-+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
-+then
-+ ac_cv_as_needed=yes
-+else
-+ ac_cv_as_needed=no
-+fi
-+rm -f conftest*])
-+AS_IF([test "x$ac_cv_as_needed" = xyes],
-+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
-+AC_SUBST(LD_AS_NEEDED)
-+
-+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
-+ ac_cv_popcount=yes, ac_cv_popcount=no)])
-+AS_IF([test "x$ac_cv_popcount" = xyes],
-+ [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
-+
- AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
- # Use the same flags that we use for our DSOs, so the test is representative.
- # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) {
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"])
- AS_IF([test "x$ac_cv_tls" != xyes],
-- AC_MSG_ERROR([__thread support required]))
-+ [AS_IF([test "$use_locks" = yes],
-+ [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
-+ [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
-+ [Stubbed out if missing compiler support.])])])
-
- dnl This test must come as early as possible after the compiler configuration
- dnl tests, because the choice of the file model can (in principle) affect
-@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
- AM_CONDITIONAL(BUILD_STATIC, [dnl
- test "$use_gprof" = yes -o "$use_gcov" = yes])
-
-+AC_ARG_ENABLE([werror],
-+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),
-+ [enable_werror=$enableval], [enable_werror=yes])
-+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)
-+
- AC_ARG_ENABLE([tests-rpath],
- AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
- [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -297,7 +353,7 @@ case "$eu_version" in
- esac
-
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
-
- AC_CHECK_SIZEOF(long)
-
---- elfutils/lib/ChangeLog
-+++ elfutils/lib/ChangeLog
-@@ -65,6 +65,9 @@
-
- 2009-01-23 Roland McGrath <roland@redhat.com>
-
-+ * eu-config.h [! HAVE_BUILTIN_POPCOUNT]
-+ (__builtin_popcount): New inline function.
-+
- * eu-config.h: Add multiple inclusion protection.
-
- 2009-01-17 Ulrich Drepper <drepper@redhat.com>
-@@ -121,6 +124,11 @@
- * Makefile.am (libeu_a_SOURCES): Add it.
- * system.h: Declare crc32_file.
-
-+2005-02-07 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-04-30 Ulrich Drepper <drepper@redhat.com>
-
- * Makefile.am: Use -ffunction-sections for xmalloc.c.
---- elfutils/lib/eu-config.h
-+++ elfutils/lib/eu-config.h
-@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
- /* This macro is used by the tests conditionalize for standalone building. */
- #define ELFUTILS_HEADER(name) <lib##name.h>
-
-+#ifndef HAVE_BUILTIN_POPCOUNT
-+# define __builtin_popcount hakmem_popcount
-+static inline unsigned int __attribute__ ((unused))
-+hakmem_popcount (unsigned int x)
-+{
-+ /* HAKMEM 169 */
-+ unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
-+ return ((n + (n >> 3)) & 030707070707) % 63;
-+}
-+#endif /* HAVE_BUILTIN_POPCOUNT */
-+
-
- #ifdef SHARED
- # define OLD_VERSION(name, version) \
---- elfutils/lib/Makefile.in
-+++ elfutils/lib/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = lib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -197,6 +198,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -228,6 +230,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -289,9 +292,11 @@ top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(srcdir)/../libelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- $($(*F)_no_Werror),,-Werror) $(if \
-- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1) -fpic
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
---- elfutils/libasm/ChangeLog
-+++ elfutils/libasm/ChangeLog
-@@ -79,6 +79,11 @@
- * asm_error.c: Add new error ASM_E_IOERROR.
- * libasmP.h: Add ASM_E_IOERROR definition.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-02-15 Ulrich Drepper <drepper@redhat.com>
-
- * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libasm/Makefile.in
-+++ elfutils/libasm/Makefile.in
-@@ -83,8 +83,9 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- noinst_PROGRAMS = $(am__EXEEXT_1)
--@USE_LOCKS_TRUE@am__append_1 = -lpthread
-+@USE_LOCKS_TRUE@am__append_2 = -lpthread
- subdir = libasm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -248,6 +249,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -279,6 +281,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -341,11 +344,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
- -I$(top_srcdir)/libdw
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \
- libasm.so.$(VERSION)
-@@ -370,7 +373,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
-
- libasm_pic_a_SOURCES =
- am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
--libasm_so_LDLIBS = $(am__append_1)
-+libasm_so_LDLIBS = $(am__append_2)
- libasm_so_SOURCES =
- noinst_HEADERS = libasmP.h symbolhash.h
- EXTRA_DIST = libasm.map
---- elfutils/libcpu/ChangeLog
-+++ elfutils/libcpu/ChangeLog
-@@ -51,6 +51,9 @@
-
- 2009-01-23 Roland McGrath <roland@redhat.com>
-
-+ * i386_disasm.c (i386_disasm): Add abort after assert-constant for old
-+ compilers that don't realize it's noreturn.
-+
- * Makefile.am (i386_parse_CFLAGS): Use quotes around command
- substitution that can produce leading whitespace.
-
-@@ -380,6 +383,11 @@
- * defs/i386.doc: New file.
- * defs/x86_64: New file.
-
-+2005-04-04 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it instead of -Wextra.
-+
- 2005-02-15 Ulrich Drepper <drepper@redhat.com>
-
- * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libcpu/i386_disasm.c
-+++ elfutils/libcpu/i386_disasm.c
-@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
-
- default:
- assert (! "INVALID not handled");
-+ abort ();
- }
- }
- else
---- elfutils/libcpu/Makefile.in
-+++ elfutils/libcpu/Makefile.in
-@@ -84,6 +84,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- $(srcdir)/Makefile.am i386_lex.c i386_parse.c \
- $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- $(am__noinst_HEADERS_DIST) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
- subdir = libcpu
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -223,6 +224,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -254,6 +256,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -316,10 +319,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- $($(*F)_no_Werror),,-Werror) $(if \
-- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic \
-- -fdollars-in-identifiers
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1) -fpic -fdollars-in-identifiers
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(foreach P,i386 x86_64,$P_defs \
- $P.mnemonics)
---- elfutils/libdw/ChangeLog
-+++ elfutils/libdw/ChangeLog
-@@ -439,6 +439,10 @@
-
- * Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
-
-+2011-07-20 Mark Wielaard <mjw@redhat.com>
-+
-+ * dwarf_begin_elf.c: Add fallback for be64toh if not defined.
-+
- 2011-07-14 Mark Wielaard <mjw@redhat.com>
-
- * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -798,6 +802,10 @@
-
- * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
-
-+2009-08-17 Roland McGrath <roland@redhat.com>
-+
-+ * libdw.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-10 Roland McGrath <roland@redhat.com>
-
- * dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1566,6 +1574,11 @@
-
- 2005-05-31 Roland McGrath <roland@redhat.com>
-
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
- * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
- formref offset.
-
---- elfutils/libdw/dwarf_begin_elf.c
-+++ elfutils/libdw/dwarf_begin_elf.c
-@@ -47,6 +47,14 @@
- #if USE_ZLIB
- # include <endian.h>
- # define crc32 loser_crc32
-+# ifndef be64toh
-+# include <byteswap.h>
-+# if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define be64toh(x) bswap_64 (x)
-+# else
-+# define be64toh(x) (x)
-+# endif
-+# endif
- # include <zlib.h>
- # undef crc32
- #endif
---- elfutils/libdw/libdw.h
-+++ elfutils/libdw/libdw.h
-@@ -915,7 +915,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
-
-
- /* Inline optimizations. */
--#ifdef __OPTIMIZE__
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- /* Return attribute code of given attribute. */
- __libdw_extern_inline unsigned int
- dwarf_whatattr (Dwarf_Attribute *attr)
---- elfutils/libdw/Makefile.in
-+++ elfutils/libdw/Makefile.in
-@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- ChangeLog
--@BUILD_STATIC_TRUE@am__append_1 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@BUILD_STATIC_TRUE@am__append_2 = -fpic
- noinst_PROGRAMS = $(am__EXEEXT_1)
- subdir = libdw
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -296,6 +297,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -327,6 +329,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -388,10 +391,11 @@ top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(srcdir)/../libelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- $($(*F)_no_Werror),,-Werror) $(if \
-- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \
-- $(am__append_1)
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1) $(am__append_2)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
---- elfutils/libdwelf/Makefile.in
-+++ elfutils/libdwelf/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = libdwelf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -258,6 +260,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -320,11 +323,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- -I$(srcdir)/../libdwfl -I$(srcdir)/../libebl
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libdwelf_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
---- elfutils/libdwfl/ChangeLog
-+++ elfutils/libdwfl/ChangeLog
-@@ -467,6 +467,21 @@
- (dwfl_module_addrsym) (i_to_symfile): New function.
- (dwfl_module_addrsym) (search_table): Use it.
-
-+2013-11-09 Jan Kratochvil <jan.kratochvil@redhat.com>
-+
-+ Older OS compatibility bits.
-+ * linux-core-attach.c (be64toh, le64toh, be32toh, le32toh): Provide
-+ fallbacks if not defined by system.
-+
-+2013-11-09 Jan Kratochvil <jan.kratochvil@redhat.com>
-+
-+ Handle T-stopped detach for old kernels.
-+ * linux-pid-attach.c (struct pid_arg): New field stopped.
-+ (ptrace_attach): New parameter stoppedp. Set it appropriately.
-+ (pid_set_initial_registers): Pass the new field.
-+ (pid_thread_detach): Handle the case of STOPPED for old kernels.
-+ (__libdwfl_attach_state_for_pid): Initialize STOPPED.
-+
- 2013-11-07 Jan Kratochvil <jan.kratochvil@redhat.com>
- Mark Wielaard <mjw@redhat.com>
-
-@@ -2232,6 +2247,11 @@
-
- 2005-07-21 Roland McGrath <roland@redhat.com>
-
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-07-21 Roland McGrath <roland@redhat.com>
-+
- * Makefile.am (noinst_HEADERS): Add loc2c.c.
-
- * test2.c (main): Check sscanf result to quiet warning.
---- elfutils/libdwfl/linux-core-attach.c
-+++ elfutils/libdwfl/linux-core-attach.c
-@@ -29,6 +29,35 @@
- #include "libdwflP.h"
- #include <fcntl.h>
- #include "system.h"
-+#include <endian.h>
-+#include <byteswap.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# ifndef be64toh
-+# define be64toh(x) bswap_64 (x)
-+# endif
-+# ifndef le64toh
-+# define le64toh(x) (x)
-+# endif
-+# ifndef be32toh
-+# define be32toh(x) bswap_32 (x)
-+# endif
-+# ifndef le32toh
-+# define le32toh(x) (x)
-+# endif
-+#else
-+# ifndef be64toh
-+# define be64toh(x) (x)
-+# endif
-+# ifndef le64toh
-+# define le64toh(x) bswap_64 (x)
-+# endif
-+# ifndef be32toh
-+# define be32toh(x) (x)
-+# endif
-+# ifndef le32toh
-+# define le32toh(x) bswap_32 (x)
-+# endif
-+#endif
-
- #include "../libdw/memory-access.h"
-
---- elfutils/libdwfl/linux-pid-attach.c
-+++ elfutils/libdwfl/linux-pid-attach.c
-@@ -255,6 +255,11 @@ void
- internal_function
- __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
- {
-+ // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special
-+ // handling of the detachment to keep the process State: T (stopped).
-+ if (tid_was_stopped)
-+ syscall (__NR_tkill, tid, SIGSTOP);
-+
- /* This handling is needed only on older Linux kernels such as
- 2.6.32-358.23.2.el6.ppc64. Later kernels such as
- 3.11.7-200.fc19.x86_64 remember the T (stopped) state
-@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool
- PTRACE_DETACH. */
- ptrace (PTRACE_DETACH, tid, NULL,
- (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0));
-+
-+ if (tid_was_stopped)
-+ {
-+ // Wait till the SIGSTOP settles down.
-+ int i;
-+ for (i = 0; i < 100000; i++)
-+ if (linux_proc_pid_is_stopped (tid))
-+ break;
-+ }
- }
-
- static void
---- elfutils/libdwfl/Makefile.in
-+++ elfutils/libdwfl/Makefile.in
-@@ -82,9 +82,10 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
--@ZLIB_TRUE@am__append_1 = gzip.c
--@BZLIB_TRUE@am__append_2 = bzip2.c
--@LZMA_TRUE@am__append_3 = lzma.c
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@ZLIB_TRUE@am__append_2 = gzip.c
-+@BZLIB_TRUE@am__append_3 = bzip2.c
-+@LZMA_TRUE@am__append_4 = lzma.c
- subdir = libdwfl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -286,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -317,6 +319,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -379,11 +382,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. -I$(srcdir) \
- -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
-@@ -410,8 +413,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
- dwfl_module_register_names.c dwfl_segment_report_module.c \
- link_map.c core-file.c open.c image-header.c dwfl_frame.c \
- frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
-- linux-core-attach.c dwfl_frame_regs.c $(am__append_1) \
-- $(am__append_2) $(am__append_3)
-+ linux-core-attach.c dwfl_frame_regs.c $(am__append_2) \
-+ $(am__append_3) $(am__append_4)
- libdwfl = $(libdw)
- libdw = ../libdw/libdw.so
- libelf = ../libelf/libelf.so
---- elfutils/libebl/ChangeLog
-+++ elfutils/libebl/ChangeLog
-@@ -754,6 +754,11 @@
- * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
- tracking works right.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-21 Ulrich Drepper <drepper@redhat.com>
-
- * libebl_x86_64.map: Add x86_64_core_note.
---- elfutils/libebl/Makefile.in
-+++ elfutils/libebl/Makefile.in
-@@ -82,6 +82,7 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- subdir = libebl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -249,6 +250,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -280,6 +282,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -342,9 +345,11 @@ zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- -I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- -I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- $($(*F)_no_Werror),,-Werror) $(if \
-- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) -fpic
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1) -fpic
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
---- elfutils/libelf/ChangeLog
-+++ elfutils/libelf/ChangeLog
-@@ -139,6 +139,11 @@
-
- * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
-
-+2011-03-10 Roland McGrath <roland@redhat.com>
-+
-+ * gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32
-+ argument, since some implementations are buggy macros.
-+
- 2011-02-26 Mark Wielaard <mjw@redhat.com>
-
- * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -816,6 +821,11 @@
-
- * elf.h: Update from glibc.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-08 Roland McGrath <roland@redhat.com>
-
- * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
---- elfutils/libelf/common.h
-+++ elfutils/libelf/common.h
-@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
- (Var) = (sizeof (Var) == 1 \
- ? (unsigned char) (Var) \
- : (sizeof (Var) == 2 \
-- ? bswap_16 (Var) \
-+ ? (unsigned short int) bswap_16 (Var) \
- : (sizeof (Var) == 4 \
- ? bswap_32 (Var) \
- : bswap_64 (Var))))
-@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)
- (Dst) = (sizeof (Var) == 1 \
- ? (unsigned char) (Var) \
- : (sizeof (Var) == 2 \
-- ? bswap_16 (Var) \
-+ ? (unsigned short int) bswap_16 (Var) \
- : (sizeof (Var) == 4 \
- ? bswap_32 (Var) \
- : bswap_64 (Var))))
---- elfutils/libelf/gnuhash_xlate.h
-+++ elfutils/libelf/gnuhash_xlate.h
-@@ -1,5 +1,5 @@
- /* Conversion functions for versioning information.
-- Copyright (C) 2006, 2007 Red Hat, Inc.
-+ Copyright (C) 2006-2011 Red Hat, Inc.
- This file is part of elfutils.
- Written by Ulrich Drepper <drepper@redhat.com>, 2006.
-
-@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void
- dest32 = (Elf32_Word *) &dest64[bitmask_words];
- while (len >= 4)
- {
-- *dest32++ = bswap_32 (*src32++);
-+ *dest32 = bswap_32 (*src32);
-+ ++dest32;
-+ ++src32;
- len -= 4;
- }
- }
---- elfutils/libelf/Makefile.in
-+++ elfutils/libelf/Makefile.in
-@@ -84,9 +84,10 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- ChangeLog
--@BUILD_STATIC_TRUE@am__append_1 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@BUILD_STATIC_TRUE@am__append_2 = -fpic
- noinst_PROGRAMS = $(am__EXEEXT_1)
--@USE_LOCKS_TRUE@am__append_2 = -lpthread
-+@USE_LOCKS_TRUE@am__append_3 = -lpthread
- subdir = libelf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -291,6 +292,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -322,6 +324,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -382,10 +385,11 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 $(if \
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
- $($(*F)_no_Werror),,-Werror) $(if \
-- $($(*F)_no_Wunused),,-Wunused -Wextra) $($(*F)_CFLAGS) \
-- $(am__append_1)
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1) $(am__append_2)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \
- libelf.so.$(VERSION)
-@@ -446,7 +450,7 @@ libelf_a_SOURCES = elf_version.c elf_has
-
- libelf_pic_a_SOURCES =
- am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
--libelf_so_LDLIBS = $(am__append_2)
-+libelf_so_LDLIBS = $(am__append_3)
- libelf_so_SOURCES =
- noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
- version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
---- elfutils/m4/Makefile.in
-+++ elfutils/m4/Makefile.in
-@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -176,6 +177,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/Makefile.in
-+++ elfutils/Makefile.in
-@@ -263,6 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -294,6 +295,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/src/addr2line.c
-+++ elfutils/src/addr2line.c
-@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl
- bool parsed = false;
- int i, j;
- char *name = NULL;
-- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
-+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
- && string[i] == '\0')
- parsed = adjust_to_section (name, &addr, dwfl);
-- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
-+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
- {
- default:
- break;
---- elfutils/src/ChangeLog
-+++ elfutils/src/ChangeLog
-@@ -1155,8 +1155,16 @@
- * readelf.c (attr_callback): Use print_block only when we don't use
- print_ops.
-
-+2009-08-17 Roland McGrath <roland@redhat.com>
-+
-+ * ld.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-14 Roland McGrath <roland@redhat.com>
-
-+ * strings.c (read_block): Conditionalize posix_fadvise use
-+ on [POSIX_FADV_SEQUENTIAL].
-+ From Petr Salinger <Petr.Salinger@seznam.cz>.
-+
- * ar.c (do_oper_extract): Use pathconf instead of statfs.
-
- 2009-08-01 Ulrich Drepper <drepper@redhat.com>
-@@ -1320,6 +1328,8 @@
- * readelf.c (print_debug_frame_section): Use t instead of j formats
- for ptrdiff_t OFFSET.
-
-+ * addr2line.c (handle_address): Use %a instead of %m for compatibility.
-+
- 2009-01-21 Ulrich Drepper <drepper@redhat.com>
-
- * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1503,6 +1513,11 @@
- that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really
- is valid in RELRO.
-
-+2008-03-01 Roland McGrath <roland@redhat.com>
-+
-+ * readelf.c (dump_archive_index): Tweak portability hack
-+ to match [__GNUC__ < 4] too.
-+
- 2008-02-29 Roland McGrath <roland@redhat.com>
-
- * readelf.c (print_attributes): Add a cast.
-@@ -1754,6 +1769,8 @@
-
- * readelf.c (hex_dump): Fix rounding error in whitespace calculation.
-
-+ * Makefile.am (readelf_no_Werror): New variable.
-+
- 2007-10-15 Roland McGrath <roland@redhat.com>
-
- * make-debug-archive.in: New file.
-@@ -2193,6 +2210,10 @@
- * elflint.c (valid_e_machine): Add EM_ALPHA.
- Reported by Christian Aichinger <Greek0@gmx.net>.
-
-+ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
-+ MADV_SEQUENTIAL if undefined. Don't call posix_madvise
-+ if neither is defined.
-+
- 2006-08-08 Ulrich Drepper <drepper@redhat.com>
-
- * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2269,6 +2290,10 @@
- * Makefile.am: Add hacks to create dependency files for non-generic
- linker.
-
-+2006-04-05 Roland McGrath <roland@redhat.com>
-+
-+ * strings.c (MAP_POPULATE): Define to 0 if undefined.
-+
- 2006-06-12 Ulrich Drepper <drepper@redhat.com>
-
- * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2617,6 +2642,11 @@
- * readelf.c (print_debug_loc_section): Fix indentation for larger
- address size.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-30 Roland McGrath <roland@redhat.com>
-
- * readelf.c (print_debug_line_section): Print section offset of each
---- elfutils/src/findtextrel.c
-+++ elfutils/src/findtextrel.c
-@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
-
-
- static void
--check_rel (size_t nsegments, struct segments segments[nsegments],
-+check_rel (size_t nsegments, struct segments segments[
-+#if __GNUC__ >= 4
-+ nsegments
-+#endif
-+ ],
- GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
- const char *fname, bool more_than_one, void **knownsrcs)
- {
---- elfutils/src/ld.h
-+++ elfutils/src/ld.h
-@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
-
- /* Checked whether the symbol is undefined and referenced from a DSO. */
- extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- #ifdef __GNUC_STDC_INLINE__
- __attribute__ ((__gnu_inline__))
- #endif
-@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin
-
- return sym->defined && sym->in_dso;
- }
-+#endif /* Optimizing and not GCC 4.2. */
-
- #endif /* ld.h */
---- elfutils/src/Makefile.am
-+++ elfutils/src/Makefile.am
-@@ -89,6 +89,11 @@ endif
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
-
-+# Buggy old compilers or libc headers.
-+readelf_no_Werror = yes
-+strings_no_Werror = yes
-+addr2line_no_Wformat = yes
-+
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- $(demanglelib)
---- elfutils/src/Makefile.in
-+++ elfutils/src/Makefile.in
-@@ -85,6 +85,7 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- $(srcdir)/Makefile.am ldlex.c ldscript.c \
- $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- $(noinst_HEADERS) ChangeLog
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
- bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
- strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
- findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
-@@ -93,9 +94,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
- @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- # We never build this library but we need to get the dependency files
- # of all the linker backends that might be used in a non-generic linker.
--@NEVER_TRUE@am__append_1 = libdummy.a
-+@NEVER_TRUE@am__append_2 = libdummy.a
- # -ldl is always needed for libebl.
--@NATIVE_LD_TRUE@am__append_2 = libld_elf.a
-+@NATIVE_LD_TRUE@am__append_3 = libld_elf.a
- @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -159,7 +160,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
- ldscript.$(OBJEXT) symbolhash.$(OBJEXT) sectionhash.$(OBJEXT) \
- versionhash.$(OBJEXT)
- ld_OBJECTS = $(am_ld_OBJECTS)
--ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_2)
-+ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__append_3)
- ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
- $@
- am_libld_elf_i386_so_OBJECTS =
-@@ -340,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -371,6 +373,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -434,11 +437,11 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
- -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
- -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \
- $(ld_modules:.c=.os) *.gconv
-@@ -449,8 +452,8 @@ AM_LFLAGS = -Pld -olex.yy.c
- native_ld = @native_ld@
- ld_dsos = libld_elf_i386_pic.a
- @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
--@NATIVE_LD_FALSE@ $(am__append_1)
--@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_1)
-+@NATIVE_LD_FALSE@ $(am__append_2)
-+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)
- @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
- @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
- ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -476,13 +479,18 @@ libeu = ../lib/libeu.a
-
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
-+
-+# Buggy old compilers or libc headers.
-+readelf_no_Werror = yes
-+strings_no_Werror = yes
-+addr2line_no_Wformat = yes
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- $(demanglelib)
-
- size_LDADD = $(libelf) $(libeu)
- strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl
--ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_2)
-+ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(am__append_3)
- ld_LDFLAGS = -rdynamic
- elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl
- findtextrel_LDADD = $(libdw) $(libelf)
---- elfutils/src/readelf.c
-+++ elfutils/src/readelf.c
-@@ -4253,10 +4253,12 @@ listptr_base (struct listptr *p)
- return base;
- }
-
-+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;
-+ const char *const name = listptr_name;
- struct listptr *p1 = (void *) a;
- struct listptr *p2 = (void *) b;
-
-@@ -4345,8 +4347,11 @@ 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);
-+ {
-+ listptr_name = name;
-+ qsort (table->table, table->n, sizeof table->table[0],
-+ &compare_listptr);
-+ }
- }
-
- static bool
-@@ -9268,7 +9273,7 @@ dump_archive_index (Elf *elf, const char
- if (unlikely (elf_rand (elf, as_off) == 0)
- || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
- == NULL))
--#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
-+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4
- while (1)
- #endif
- error (EXIT_FAILURE, 0,
---- elfutils/src/strings.c
-+++ elfutils/src/strings.c
-@@ -43,6 +43,10 @@
-
- #include <system.h>
-
-+#ifndef MAP_POPULATE
-+# define MAP_POPULATE 0
-+#endif
-+
-
- /* Prototypes of local functions. */
- static int read_fd (int fd, const char *fname, off64_t fdlen);
-@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off
- fd, start_off);
- if (mem != MAP_FAILED)
- {
-+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
-+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
-+#endif
-+#ifdef POSIX_MADV_SEQUENTIAL
- /* We will go through the mapping sequentially. */
- (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
-+#endif
- break;
- }
- if (errno != EINVAL && errno != ENOMEM)
-@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, o
- elfmap_off = from & ~(ps - 1);
- elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
-
-+#ifdef POSIX_FADV_SEQUENTIAL
- if (unlikely (elfmap == MAP_FAILED))
- /* Let the kernel know we are going to read everything in sequence. */
- (void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
-+#endif
- }
-
- if (unlikely (elfmap == MAP_FAILED))
---- elfutils/src/strip.c
-+++ elfutils/src/strip.c
-@@ -45,6 +45,12 @@
- #include <libebl.h>
- #include <system.h>
-
-+#ifdef HAVE_FUTIMES
-+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
-+#else
-+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
-+#endif
-+
- typedef uint8_t GElf_Byte;
-
- /* Name and version of program. */
-@@ -318,8 +324,18 @@ process_file (const char *fname)
-
- /* If we have to preserve the timestamp, we need it in the
- format utimes() understands. */
-+#ifdef HAVE_STRUCT_STAT_ST_ATIM
- TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
-+#else
-+ tv[0].tv_sec = pre_st.st_atime;
-+ tv[0].tv_usec = 0;
-+#endif
-+#ifdef HAVE_STRUCT_STAT_ST_MTIM
- TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
-+#else
-+ tv[1].tv_sec = pre_st.st_atime;
-+ tv[1].tv_usec = 0;
-+#endif
- }
-
- /* Open the file. */
-@@ -2086,7 +2102,7 @@ while computing checksum for debug infor
- /* If requested, preserve the timestamp. */
- if (tvp != NULL)
- {
-- if (futimes (fd, tvp) != 0)
-+ if (FUTIMES (fd, output_fname, tvp) != 0)
- {
- error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"),
-@@ -2143,7 +2159,7 @@ handle_ar (int fd, Elf *elf, const char
-
- if (tvp != NULL)
- {
-- if (unlikely (futimes (fd, tvp) != 0))
-+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
- {
- error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"), fname);
---- elfutils/tests/backtrace.c
-+++ elfutils/tests/backtrace.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <argp.h>
-+#include <sys/syscall.h>
- #include ELFUTILS_HEADER(dwfl)
-
- #ifndef __linux__
---- elfutils/tests/ChangeLog
-+++ elfutils/tests/ChangeLog
-@@ -304,6 +304,13 @@
-
- 2013-12-02 Jan Kratochvil <jan.kratochvil@redhat.com>
-
-+ Handle T-stopped detach for old kernels.
-+ * backtrace.c: Include sys/syscall.h.
-+ (linux_proc_pid_is_stopped): New function.
-+ (ptrace_detach_stopped): Handle old kernels.
-+
-+2013-12-02 Jan Kratochvil <jan.kratochvil@redhat.com>
-+
- * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
- backtrace-data and backtrace-dwarf.
- (BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
-@@ -1168,6 +1175,8 @@
-
- 2008-01-21 Roland McGrath <roland@redhat.com>
-
-+ * line2addr.c (main): Revert last change.
-+
- * testfile45.S.bz2: Add tests for cltq, cqto.
- * testfile45.expect.bz2: Adjust.
-
-@@ -1876,6 +1885,11 @@
- * Makefile.am (TESTS): Add run-elflint-test.sh.
- (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
-
-+2005-05-31 Roland McGrath <roland@redhat.com>
-+
-+ * Makefile.am (WEXTRA): New variable, substituted by configure.
-+ (AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-24 Ulrich Drepper <drepper@redhat.com>
-
- * get-files.c (main): Use correct format specifier.
---- elfutils/tests/line2addr.c
-+++ elfutils/tests/line2addr.c
-@@ -124,7 +124,7 @@ main (int argc, char *argv[])
- {
- struct args a = { .arg = argv[cnt] };
-
-- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
-+ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
- {
- default:
- case 0:
---- elfutils/tests/Makefile.am
-+++ elfutils/tests/Makefile.am
-@@ -356,6 +356,7 @@ get_lines_LDADD = $(libdw) $(libelf)
- get_files_LDADD = $(libdw) $(libelf)
- get_aranges_LDADD = $(libdw) $(libelf)
- allfcts_LDADD = $(libdw) $(libelf)
-+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
---- elfutils/tests/Makefile.in
-+++ elfutils/tests/Makefile.in
-@@ -80,13 +80,14 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- $(top_srcdir)/config/test-driver ChangeLog
--@STANDALONE_FALSE@am__append_1 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
- @STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl -I$(top_srcdir)/libdwelf \
- @STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
- @STANDALONE_FALSE@ -I$(top_srcdir)/lib -I..
-
--@STANDALONE_FALSE@am__append_2 = -Wl,-rpath-link,../libasm:../libdw:../libelf
--@TESTS_RPATH_TRUE@am__append_3 = -Wl,-rpath,$(BUILD_RPATH)
-+@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf
-+@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)
- check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
- newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
- sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -111,7 +112,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
- backtrace-data$(EXEEXT) backtrace-dwarf$(EXEEXT) \
- debuglink$(EXEEXT) debugaltlink$(EXEEXT) buildid$(EXEEXT) \
- $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
--@BIARCH_TRUE@am__append_4 = backtrace-child-biarch
-+@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
- TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
- test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
- update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
-@@ -155,14 +156,14 @@ TESTS = run-arextract.sh run-arsymtest.s
- run-backtrace-core-s390.sh run-backtrace-core-aarch64.sh \
- run-backtrace-demangle.sh run-stack-d-test.sh \
- run-stack-i-test.sh run-readelf-dwz-multi.sh \
-- run-allfcts-multi.sh $(am__EXEEXT_2) $(am__append_7) \
-- $(am__append_8) $(am__EXEEXT_4)
--@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
-+ run-allfcts-multi.sh $(am__EXEEXT_2) $(am__append_8) \
-+ $(am__append_9) $(am__EXEEXT_4)
- @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
--@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
--@ZLIB_TRUE@am__append_8 = run-readelf-zdebug.sh
--@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
-+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
-+@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
-+@ZLIB_TRUE@am__append_9 = run-readelf-zdebug.sh
- @HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
-+@HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS)
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -768,6 +769,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -799,6 +801,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -858,17 +861,17 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
--AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_1)
--AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
-- $(if $($(*F)_no_Werror),,-Werror) \
-- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-- $($(*F)_CFLAGS)
--
-+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
-+AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
-+ $($(*F)_no_Werror),,-Werror) $(if \
-+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
-+ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
-+ $(am__append_1)
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
- BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
--AM_LDFLAGS = $(am__append_2) $(am__append_3)
-+AM_LDFLAGS = $(am__append_3) $(am__append_4)
- @TESTS_RPATH_FALSE@tests_rpath = no
- @TESTS_RPATH_TRUE@tests_rpath = yes
- asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
-@@ -1077,6 +1080,7 @@ get_lines_LDADD = $(libdw) $(libelf)
- get_files_LDADD = $(libdw) $(libelf)
- get_aranges_LDADD = $(libdw) $(libelf)
- allfcts_LDADD = $(libdw) $(libelf)
-+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
+++ /dev/null
-Allow the usage of an external implementation of the argp functions
-
-uClibc lack the argp family of functions that glibc has. Therefore, we
-add a check in the configure script to see if argp_parse is available
-in the C library. If not, we look if it is available in the additional
-'argp' library. If so, we link against that library. If not, we error
-out.
-
-This allows to build elfutils against uClibc with an external argp
-library.
-
-Based on the former patch by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/configure.ac b/configure.ac
---- a/configure.ac 2014-11-07 15:00:38.663627402 +0000
-+++ b/configure.ac 2014-11-07 15:02:30.233539737 +0000
-@@ -259,6 +259,13 @@ AC_ARG_ENABLE([progs],
- enable_progs=yes)
- AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
-
-+AC_CHECK_FUNC([argp_parse])
-+if test "$ac_cv_func_argp_parse" != yes; then
-+ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
-+ AC_MSG_ERROR([No argp_parse function available.]))
-+fi
-+AC_SUBST(ARGP_LIBS)
-+
- dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
- dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
- save_LIBS="$LIBS"
-diff -rup a/libdw/Makefile.am b/libdw/Makefile.am
---- a/libdw/Makefile.am 2014-08-27 10:25:17.000000000 +0100
-+++ b/libdw/Makefile.am 2014-11-07 15:09:32.804794962 +0000
-@@ -110,7 +110,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
- -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- -Wl,--version-script,$<,--no-undefined \
- -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
-- -ldl $(zip_LIBS)
-+ -ldl $(zip_LIBS) $(ARGP_LIBS)
- if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
- ln -fs $@ $@.$(VERSION)
-
-diff -rup a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am 2014-11-07 15:00:35.867579484 +0000
-+++ b/src/Makefile.am 2014-11-07 15:08:47.380013980 +0000
-@@ -94,27 +94,29 @@ readelf_no_Werror = yes
- strings_no_Werror = yes
- addr2line_no_Wformat = yes
-
--readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
-+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
-- $(demanglelib)
--size_LDADD = $(libelf) $(libeu)
--strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl
--ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl
-+ $(demanglelib) $(ARGP_LIBS)
-+size_LDADD = $(libelf) $(libeu) $(ARGP_LIBS)
-+strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
-+ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
- if NATIVE_LD
- # -ldl is always needed for libebl.
- ld_LDADD += libld_elf.a
- endif
- ld_LDFLAGS = -rdynamic
--elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl
--findtextrel_LDADD = $(libdw) $(libelf)
--addr2line_LDADD = $(libdw) $(libelf)
--elfcmp_LDADD = $(libebl) $(libelf) -ldl
--objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl
--ranlib_LDADD = libar.a $(libelf) $(libeu)
--strings_LDADD = $(libelf) $(libeu)
--ar_LDADD = libar.a $(libelf) $(libeu)
--unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl
--stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(demanglelib)
-+elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS)
-+findtextrel_LDADD = $(libdw) $(libelf) $(ARGP_LIBS)
-+addr2line_LDADD = $(libdw) $(libelf) $(ARGP_LIBS)
-+elfcmp_LDADD = $(libebl) $(libelf) -ldl $(ARGP_LIBS)
-+objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl \
-+ $(ARGP_LIBS)
-+ranlib_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS)
-+strings_LDADD = $(libelf) $(libeu) $(ARGP_LIBS)
-+ar_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS)
-+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(ARGP_LIBS)
-+stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl \
-+ $(demanglelib) $(ARGP_LIBS)
-
- ldlex.o: ldscript.c
- ldlex_no_Werror = yes
--- /dev/null
+Add a --{enable,disable}-progs configure option
+
+Add a --{enable,disable}-progs configuration option to elfutils. This
+allows to selectively disable the compilation of the elfutils programs
+(in which case only the libraries are built and installed). This is
+useful because the programs are often not needed, and also because
+building the programs against uClibc causes several issues (lack of
+obstack_printf() in uClibc for example).
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/configure.ac b/configure.ac
+--- a/configure.ac 2015-01-06 11:31:10.122219826 +0000
++++ b/configure.ac 2015-01-06 11:37:38.397891424 +0000
+@@ -260,6 +260,12 @@ if test "$ac_cv_func_argp_parse" != yes;
+ fi
+ AC_SUBST(ARGP_LIBS)
+
++AC_ARG_ENABLE([progs],
++ AS_HELP_STRING([--enable-progs], [enable progs]),
++ enable_progs=$enableval,
++ enable_progs=yes)
++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+diff -rup a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2014-06-17 19:51:09.000000000 +0100
++++ b/Makefile.am 2015-01-06 11:38:42.846999410 +0000
+@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4
+
+ pkginclude_HEADERS = version.h
+
++if ENABLE_PROGS
++PROGS_SUBDIR = src
++endif
++
+ # Add doc back when we have some real content.
+ SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
+- backends src po tests
++ backends $(PROGS_SUBDIR) po tests
+
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ COPYING COPYING-GPLV2 COPYING-LGPLV3
+++ /dev/null
-Add a --{enable,disable}-progs configure option
-
-Add a --{enable,disable}-progs configuration option to elfutils. This
-allows to selectively disable the compilation of the elfutils programs
-(in which case only the libraries are built and installed). This is
-useful because the programs are often not needed, and also because
-building the programs against uClibc causes several issues (lack of
-obstack_printf() in uClibc for example).
-
-Based on the former patch by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/configure.ac b/configure.ac
---- a/configure.ac 2014-11-07 14:54:32.859360779 +0000
-+++ b/configure.ac 2014-11-07 14:47:44.847376394 +0000
-@@ -253,6 +253,12 @@ AC_SUBST([LIBEBL_SUBDIR])
- AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
- AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
-
-+AC_ARG_ENABLE([progs],
-+ AS_HELP_STRING([--enable-progs], [enable progs]),
-+ enable_progs=$enableval,
-+ enable_progs=yes)
-+AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
-+
- dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
- dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
- save_LIBS="$LIBS"
-diff -rup a/Makefile.am b/Makefile.am
---- a/Makefile.am 2014-08-27 10:25:17.000000000 +0100
-+++ b/Makefile.am 2014-11-07 14:51:38.081368550 +0000
-@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4
-
- pkginclude_HEADERS = version.h
-
-+if ENABLE_PROGS
-+PROGS_SUBDIR = src
-+endif
-+
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
-- backends src po tests
-+ backends $(PROGS_SUBDIR) po tests
-
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- COPYING COPYING-GPLV2 COPYING-LGPLV3
--- /dev/null
+Add an implementation of the fts_*() functions
+
+The fts_*() functions are optional in uClibc, and not compiled in our
+default configuration. The best option would be to migrate this
+elfutils code to the nftw family of functions, but it requires quite
+some work.
+
+So we have several options here:
+
+ *) Enable fts_*() functions in our default uClibc configuration. Not
+ nice since only one package needs them (the help text of uClibc
+ for fts_*() functions explicitly mention that they have been added
+ to be able to build elfutils).
+
+ *) Use gnulib, but it is quite heavy to setup, requires modifications
+ to configure.ac, and other things.
+
+ *) Copy the fts function from uClibc into elfutils source code. This
+ is the solution used below. uClibc is LGPL, and elfutils is
+ LGPL/GPL, so there should not be any licensing issue.
+
+Of course, the fts_*() functions are only built if they are not
+already provided by the C library.
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -Nrup a/configure.ac b/configure.ac
+--- a/configure.ac 2015-01-06 11:37:38.397891424 +0000
++++ b/configure.ac 2015-01-06 11:40:53.568258759 +0000
+@@ -266,6 +266,10 @@ AC_ARG_ENABLE([progs],
+ enable_progs=yes)
+ AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
+
++AC_CHECK_HEADER([fts.h],
++ AC_DEFINE([HAVE_FTS_H], [], [Define if <fts.h> is available in C library]))
++AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c
+--- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100
++++ b/libdwfl/fts.c 2015-01-06 11:42:13.481640322 +0000
+@@ -0,0 +1,1095 @@
++/*-
++ * Copyright (c) 1990, 1993, 1994
++ * The Regents of the University of California. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#include <sys/param.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include "fts_.h"
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++/* Largest alignment size needed, minus one.
++ Usually long double is the worst case. */
++#ifndef ALIGNBYTES
++#define ALIGNBYTES (__alignof__ (long double) - 1)
++#endif
++/* Align P to that size. */
++#ifndef ALIGN
++#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
++#endif
++
++
++static FTSENT *fts_alloc (FTS *, const char *, size_t);
++static FTSENT *fts_build (FTS *, int);
++static void fts_lfree (FTSENT *);
++static void fts_load (FTS *, FTSENT *);
++static size_t fts_maxarglen (char * const *);
++static void fts_padjust (FTS *, FTSENT *);
++static int fts_palloc (FTS *, size_t);
++static FTSENT *fts_sort (FTS *, FTSENT *, int);
++static u_short fts_stat (FTS *, FTSENT *, int);
++static int fts_safe_changedir (FTS *, FTSENT *, int, const char *);
++
++#ifndef MAX
++#define MAX(a, b) ({ __typeof__ (a) _a = (a); \
++ __typeof__ (b) _b = (b); \
++ _a > _b ? _a : _b; })
++#endif
++
++#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
++
++#define CLR(opt) (sp->fts_options &= ~(opt))
++#define ISSET(opt) (sp->fts_options & (opt))
++#define SET(opt) (sp->fts_options |= (opt))
++
++#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
++
++/* fts_build flags */
++#define BCHILD 1 /* fts_children */
++#define BNAMES 2 /* fts_children, names only */
++#define BREAD 3 /* fts_read */
++
++FTS *
++fts_open( char * const *argv, register int options,
++ int (*compar) (const FTSENT **, const FTSENT **))
++{
++ register FTS *sp;
++ register FTSENT *p, *root;
++ register int nitems;
++ FTSENT *parent = NULL;
++ FTSENT *tmp = NULL;
++
++ /* Options check. */
++ if (options & ~FTS_OPTIONMASK) {
++ errno = EINVAL;
++ return (NULL);
++ }
++
++ /* Allocate/initialize the stream */
++ if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
++ return (NULL);
++ memset(sp, 0, sizeof(FTS));
++ sp->fts_compar = (int (*) (const void *, const void *)) compar;
++ sp->fts_options = options;
++
++ /* Logical walks turn on NOCHDIR; symbolic links are too hard. */
++ if (ISSET(FTS_LOGICAL))
++ SET(FTS_NOCHDIR);
++
++ /*
++ * Start out with 1K of path space, and enough, in any case,
++ * to hold the user's paths.
++ */
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 1024
++#endif
++ size_t maxarglen = fts_maxarglen(argv);
++ if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
++ goto mem1;
++
++ /* Allocate/initialize root's parent. */
++ if (*argv != NULL) {
++ if ((parent = fts_alloc(sp, "", 0)) == NULL)
++ goto mem2;
++ parent->fts_level = FTS_ROOTPARENTLEVEL;
++ }
++
++ /* Allocate/initialize root(s). */
++ for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
++ /* Don't allow zero-length paths. */
++ size_t len = strlen(*argv);
++ if (len == 0) {
++ errno = ENOENT;
++ goto mem3;
++ }
++
++ p = fts_alloc(sp, *argv, len);
++ p->fts_level = FTS_ROOTLEVEL;
++ p->fts_parent = parent;
++ p->fts_accpath = p->fts_name;
++ p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
++
++ /* Command-line "." and ".." are real directories. */
++ if (p->fts_info == FTS_DOT)
++ p->fts_info = FTS_D;
++
++ /*
++ * If comparison routine supplied, traverse in sorted
++ * order; otherwise traverse in the order specified.
++ */
++ if (compar) {
++ p->fts_link = root;
++ root = p;
++ } else {
++ p->fts_link = NULL;
++ if (root == NULL)
++ tmp = root = p;
++ else {
++ tmp->fts_link = p;
++ tmp = p;
++ }
++ }
++ }
++ if (compar && nitems > 1)
++ root = fts_sort(sp, root, nitems);
++
++ /*
++ * Allocate a dummy pointer and make fts_read think that we've just
++ * finished the node before the root(s); set p->fts_info to FTS_INIT
++ * so that everything about the "current" node is ignored.
++ */
++ if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
++ goto mem3;
++ sp->fts_cur->fts_link = root;
++ sp->fts_cur->fts_info = FTS_INIT;
++
++ /*
++ * If using chdir(2), grab a file descriptor pointing to dot to ensure
++ * that we can get back here; this could be avoided for some paths,
++ * but almost certainly not worth the effort. Slashes, symbolic links,
++ * and ".." are all fairly nasty problems. Note, if we can't get the
++ * descriptor we run anyway, just more slowly.
++ */
++ if (!ISSET(FTS_NOCHDIR)
++ && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0)
++ SET(FTS_NOCHDIR);
++
++ return (sp);
++
++mem3: fts_lfree(root);
++ free(parent);
++mem2: free(sp->fts_path);
++mem1: free(sp);
++ return (NULL);
++}
++
++static void
++fts_load(FTS *sp, register FTSENT *p)
++{
++ register int len;
++ register char *cp;
++
++ /*
++ * Load the stream structure for the next traversal. Since we don't
++ * actually enter the directory until after the preorder visit, set
++ * the fts_accpath field specially so the chdir gets done to the right
++ * place and the user can access the first node. From fts_open it's
++ * known that the path will fit.
++ */
++ len = p->fts_pathlen = p->fts_namelen;
++ memmove(sp->fts_path, p->fts_name, len + 1);
++ if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
++ len = strlen(++cp);
++ memmove(p->fts_name, cp, len + 1);
++ p->fts_namelen = len;
++ }
++ p->fts_accpath = p->fts_path = sp->fts_path;
++ sp->fts_dev = p->fts_dev;
++}
++
++int
++fts_close(FTS *sp)
++{
++ register FTSENT *freep, *p;
++ int saved_errno;
++
++ /*
++ * This still works if we haven't read anything -- the dummy structure
++ * points to the root list, so we step through to the end of the root
++ * list which has a valid parent pointer.
++ */
++ if (sp->fts_cur) {
++ for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
++ freep = p;
++ p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
++ free(freep);
++ }
++ free(p);
++ }
++
++ /* Free up child linked list, sort array, path buffer. */
++ if (sp->fts_child)
++ fts_lfree(sp->fts_child);
++ free(sp->fts_array);
++ free(sp->fts_path);
++
++ /* Return to original directory, save errno if necessary. */
++ if (!ISSET(FTS_NOCHDIR)) {
++ saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
++ (void)close(sp->fts_rfd);
++
++ /* Set errno and return. */
++ if (saved_errno != 0) {
++ /* Free up the stream pointer. */
++ free(sp);
++ errno = saved_errno;
++ return (-1);
++ }
++ }
++
++ /* Free up the stream pointer. */
++ free(sp);
++ return (0);
++}
++
++/*
++ * Special case of "/" at the end of the path so that slashes aren't
++ * appended which would cause paths to be written as "....//foo".
++ */
++#define NAPPEND(p) \
++ (p->fts_path[p->fts_pathlen - 1] == '/' \
++ ? p->fts_pathlen - 1 : p->fts_pathlen)
++
++FTSENT *
++fts_read(register FTS *sp)
++{
++ register FTSENT *p, *tmp;
++ register int instr;
++ register char *t;
++ int saved_errno;
++
++ /* If finished or unrecoverable error, return NULL. */
++ if (sp->fts_cur == NULL || ISSET(FTS_STOP))
++ return (NULL);
++
++ /* Set current node pointer. */
++ p = sp->fts_cur;
++
++ /* Save and zero out user instructions. */
++ instr = p->fts_instr;
++ p->fts_instr = FTS_NOINSTR;
++
++ /* Any type of file may be re-visited; re-stat and re-turn. */
++ if (instr == FTS_AGAIN) {
++ p->fts_info = fts_stat(sp, p, 0);
++ return (p);
++ }
++
++ /*
++ * Following a symlink -- SLNONE test allows application to see
++ * SLNONE and recover. If indirecting through a symlink, have
++ * keep a pointer to current location. If unable to get that
++ * pointer, follow fails.
++ */
++ if (instr == FTS_FOLLOW &&
++ (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
++ p->fts_info = fts_stat(sp, p, 1);
++ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
++ if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
++ p->fts_errno = errno;
++ p->fts_info = FTS_ERR;
++ } else
++ p->fts_flags |= FTS_SYMFOLLOW;
++ }
++ return (p);
++ }
++
++ /* Directory in pre-order. */
++ if (p->fts_info == FTS_D) {
++ /* If skipped or crossed mount point, do post-order visit. */
++ if (instr == FTS_SKIP ||
++ (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
++ if (p->fts_flags & FTS_SYMFOLLOW)
++ (void)close(p->fts_symfd);
++ if (sp->fts_child) {
++ fts_lfree(sp->fts_child);
++ sp->fts_child = NULL;
++ }
++ p->fts_info = FTS_DP;
++ return (p);
++ }
++
++ /* Rebuild if only read the names and now traversing. */
++ if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
++ CLR(FTS_NAMEONLY);
++ fts_lfree(sp->fts_child);
++ sp->fts_child = NULL;
++ }
++
++ /*
++ * Cd to the subdirectory.
++ *
++ * If have already read and now fail to chdir, whack the list
++ * to make the names come out right, and set the parent errno
++ * so the application will eventually get an error condition.
++ * Set the FTS_DONTCHDIR flag so that when we logically change
++ * directories back to the parent we don't do a chdir.
++ *
++ * If haven't read do so. If the read fails, fts_build sets
++ * FTS_STOP or the fts_info field of the node.
++ */
++ if (sp->fts_child != NULL) {
++ if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
++ p->fts_errno = errno;
++ p->fts_flags |= FTS_DONTCHDIR;
++ for (p = sp->fts_child; p != NULL;
++ p = p->fts_link)
++ p->fts_accpath =
++ p->fts_parent->fts_accpath;
++ }
++ } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
++ if (ISSET(FTS_STOP))
++ return (NULL);
++ return (p);
++ }
++ p = sp->fts_child;
++ sp->fts_child = NULL;
++ sp->fts_cur = p;
++ goto name;
++ }
++
++ /* Move to the next node on this level. */
++next: tmp = p;
++ if ((p = p->fts_link) != NULL) {
++ sp->fts_cur = p;
++ free(tmp);
++
++ /*
++ * If reached the top, return to the original directory (or
++ * the root of the tree), and load the paths for the next root.
++ */
++ if (p->fts_level == FTS_ROOTLEVEL) {
++ if (FCHDIR(sp, sp->fts_rfd)) {
++ SET(FTS_STOP);
++ return (NULL);
++ }
++ fts_load(sp, p);
++ return p;
++ }
++
++ /*
++ * User may have called fts_set on the node. If skipped,
++ * ignore. If followed, get a file descriptor so we can
++ * get back if necessary.
++ */
++ if (p->fts_instr == FTS_SKIP)
++ goto next;
++ if (p->fts_instr == FTS_FOLLOW) {
++ p->fts_info = fts_stat(sp, p, 1);
++ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
++ if ((p->fts_symfd =
++ open(".", O_RDONLY, 0)) < 0) {
++ p->fts_errno = errno;
++ p->fts_info = FTS_ERR;
++ } else
++ p->fts_flags |= FTS_SYMFOLLOW;
++ }
++ p->fts_instr = FTS_NOINSTR;
++ }
++
++name: t = sp->fts_path + NAPPEND(p->fts_parent);
++ *t++ = '/';
++ memmove(t, p->fts_name, p->fts_namelen + 1);
++ return p;
++ }
++
++ /* Move up to the parent node. */
++ p = tmp->fts_parent;
++ sp->fts_cur = p;
++ free(tmp);
++
++ if (p->fts_level == FTS_ROOTPARENTLEVEL) {
++ /*
++ * Done; free everything up and set errno to 0 so the user
++ * can distinguish between error and EOF.
++ */
++ free(p);
++ errno = 0;
++ return (sp->fts_cur = NULL);
++ }
++
++ /* NUL terminate the pathname. */
++ sp->fts_path[p->fts_pathlen] = '\0';
++
++ /*
++ * Return to the parent directory. If at a root node or came through
++ * a symlink, go back through the file descriptor. Otherwise, cd up
++ * one directory.
++ */
++ if (p->fts_level == FTS_ROOTLEVEL) {
++ if (FCHDIR(sp, sp->fts_rfd)) {
++ SET(FTS_STOP);
++ return (NULL);
++ }
++ } else if (p->fts_flags & FTS_SYMFOLLOW) {
++ if (FCHDIR(sp, p->fts_symfd)) {
++ saved_errno = errno;
++ (void)close(p->fts_symfd);
++ errno = saved_errno;
++ SET(FTS_STOP);
++ return (NULL);
++ }
++ (void)close(p->fts_symfd);
++ } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
++ fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
++ SET(FTS_STOP);
++ return (NULL);
++ }
++ p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
++ return p;
++}
++
++/*
++ * Fts_set takes the stream as an argument although it's not used in this
++ * implementation; it would be necessary if anyone wanted to add global
++ * semantics to fts using fts_set. An error return is allowed for similar
++ * reasons.
++ */
++/* ARGSUSED */
++int
++fts_set(FTS *sp, FTSENT *p, int instr)
++{
++ if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
++ instr != FTS_NOINSTR && instr != FTS_SKIP) {
++ errno = EINVAL;
++ return (1);
++ }
++ p->fts_instr = instr;
++ return (0);
++}
++
++FTSENT *
++fts_children(register FTS *sp, int instr)
++{
++ register FTSENT *p;
++ int fd;
++
++ if (instr != 0 && instr != FTS_NAMEONLY) {
++ errno = EINVAL;
++ return (NULL);
++ }
++
++ /* Set current node pointer. */
++ p = sp->fts_cur;
++
++ /*
++ * Errno set to 0 so user can distinguish empty directory from
++ * an error.
++ */
++ errno = 0;
++
++ /* Fatal errors stop here. */
++ if (ISSET(FTS_STOP))
++ return (NULL);
++
++ /* Return logical hierarchy of user's arguments. */
++ if (p->fts_info == FTS_INIT)
++ return (p->fts_link);
++
++ /*
++ * If not a directory being visited in pre-order, stop here. Could
++ * allow FTS_DNR, assuming the user has fixed the problem, but the
++ * same effect is available with FTS_AGAIN.
++ */
++ if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
++ return (NULL);
++
++ /* Free up any previous child list. */
++ if (sp->fts_child != NULL)
++ fts_lfree(sp->fts_child);
++
++ if (instr == FTS_NAMEONLY) {
++ SET(FTS_NAMEONLY);
++ instr = BNAMES;
++ } else
++ instr = BCHILD;
++
++ /*
++ * If using chdir on a relative path and called BEFORE fts_read does
++ * its chdir to the root of a traversal, we can lose -- we need to
++ * chdir into the subdirectory, and we don't know where the current
++ * directory is, so we can't get back so that the upcoming chdir by
++ * fts_read will work.
++ */
++ if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
++ ISSET(FTS_NOCHDIR))
++ return (sp->fts_child = fts_build(sp, instr));
++
++ if ((fd = open(".", O_RDONLY, 0)) < 0)
++ return (NULL);
++ sp->fts_child = fts_build(sp, instr);
++ if (fchdir(fd))
++ return (NULL);
++ (void)close(fd);
++ return (sp->fts_child);
++}
++
++/*
++ * This is the tricky part -- do not casually change *anything* in here. The
++ * idea is to build the linked list of entries that are used by fts_children
++ * and fts_read. There are lots of special cases.
++ *
++ * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is
++ * set and it's a physical walk (so that symbolic links can't be directories),
++ * we can do things quickly. First, if it's a 4.4BSD file system, the type
++ * of the file is in the directory entry. Otherwise, we assume that the number
++ * of subdirectories in a node is equal to the number of links to the parent.
++ * The former skips all stat calls. The latter skips stat calls in any leaf
++ * directories and for any files after the subdirectories in the directory have
++ * been found, cutting the stat calls by about 2/3.
++ */
++static FTSENT *
++fts_build(register FTS *sp, int type)
++{
++ register struct dirent *dp;
++ register FTSENT *p, *head;
++ register int nitems;
++ FTSENT *cur, *tail;
++ DIR *dirp;
++ void *oldaddr;
++ int cderrno, descend, len, level, nlinks, saved_errno,
++ nostat, doadjust;
++ size_t maxlen;
++ char *cp;
++
++ /* Set current node pointer. */
++ cur = sp->fts_cur;
++
++ /*
++ * Open the directory for reading. If this fails, we're done.
++ * If being called from fts_read, set the fts_info field.
++ */
++#if defined FTS_WHITEOUT && 0
++ if (ISSET(FTS_WHITEOUT))
++ oflag = DTF_NODUP|DTF_REWIND;
++ else
++ oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
++#else
++# define opendir2(path, flag) opendir(path)
++#endif
++ if ((dirp = opendir2(cur->fts_accpath, oflag)) == NULL) {
++ if (type == BREAD) {
++ cur->fts_info = FTS_DNR;
++ cur->fts_errno = errno;
++ }
++ return (NULL);
++ }
++
++ /*
++ * Nlinks is the number of possible entries of type directory in the
++ * directory if we're cheating on stat calls, 0 if we're not doing
++ * any stat calls at all, -1 if we're doing stats on everything.
++ */
++ if (type == BNAMES) {
++ nlinks = 0;
++ /* Be quiet about nostat, GCC. */
++ nostat = 0;
++ } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
++ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
++ nostat = 1;
++ } else {
++ nlinks = -1;
++ nostat = 0;
++ }
++
++#ifdef notdef
++ (void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
++ (void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
++ ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
++#endif
++ /*
++ * If we're going to need to stat anything or we want to descend
++ * and stay in the directory, chdir. If this fails we keep going,
++ * but set a flag so we don't chdir after the post-order visit.
++ * We won't be able to stat anything, but we can still return the
++ * names themselves. Note, that since fts_read won't be able to
++ * chdir into the directory, it will have to return different path
++ * names than before, i.e. "a/b" instead of "b". Since the node
++ * has already been visited in pre-order, have to wait until the
++ * post-order visit to return the error. There is a special case
++ * here, if there was nothing to stat then it's not an error to
++ * not be able to stat. This is all fairly nasty. If a program
++ * needed sorted entries or stat information, they had better be
++ * checking FTS_NS on the returned nodes.
++ */
++ cderrno = 0;
++ if (nlinks || type == BREAD) {
++ if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
++ if (nlinks && type == BREAD)
++ cur->fts_errno = errno;
++ cur->fts_flags |= FTS_DONTCHDIR;
++ descend = 0;
++ cderrno = errno;
++ (void)closedir(dirp);
++ dirp = NULL;
++ } else
++ descend = 1;
++ } else
++ descend = 0;
++
++ /*
++ * Figure out the max file name length that can be stored in the
++ * current path -- the inner loop allocates more path as necessary.
++ * We really wouldn't have to do the maxlen calculations here, we
++ * could do them in fts_read before returning the path, but it's a
++ * lot easier here since the length is part of the dirent structure.
++ *
++ * If not changing directories set a pointer so that can just append
++ * each new name into the path.
++ */
++ len = NAPPEND(cur);
++ if (ISSET(FTS_NOCHDIR)) {
++ cp = sp->fts_path + len;
++ *cp++ = '/';
++ } else {
++ /* GCC, you're too verbose. */
++ cp = NULL;
++ }
++ len++;
++ maxlen = sp->fts_pathlen - len;
++
++ level = cur->fts_level + 1;
++
++ /* Read the directory, attaching each entry to the `link' pointer. */
++ doadjust = 0;
++ for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
++ if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
++ continue;
++
++ if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL)
++ goto mem1;
++ if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
++ oldaddr = sp->fts_path;
++ if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
++ /*
++ * No more memory for path or structures. Save
++ * errno, free up the current structure and the
++ * structures already allocated.
++ */
++mem1: saved_errno = errno;
++ free(p);
++ fts_lfree(head);
++ (void)closedir(dirp);
++ cur->fts_info = FTS_ERR;
++ SET(FTS_STOP);
++ errno = saved_errno;
++ return (NULL);
++ }
++ /* Did realloc() change the pointer? */
++ if (oldaddr != sp->fts_path) {
++ doadjust = 1;
++ if (ISSET(FTS_NOCHDIR))
++ cp = sp->fts_path + len;
++ }
++ maxlen = sp->fts_pathlen - len;
++ }
++
++ if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
++ /*
++ * In an FTSENT, fts_pathlen is a u_short so it is
++ * possible to wraparound here. If we do, free up
++ * the current structure and the structures already
++ * allocated, then error out with ENAMETOOLONG.
++ */
++ free(p);
++ fts_lfree(head);
++ (void)closedir(dirp);
++ cur->fts_info = FTS_ERR;
++ SET(FTS_STOP);
++ errno = ENAMETOOLONG;
++ return (NULL);
++ }
++ p->fts_level = level;
++ p->fts_parent = sp->fts_cur;
++ p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
++
++#if defined FTS_WHITEOUT && 0
++ if (dp->d_type == DT_WHT)
++ p->fts_flags |= FTS_ISW;
++#endif
++
++#if 0
++ /* Unreachable code. cderrno is only ever set to a nonnull
++ value if dirp is closed at the same time. But then we
++ cannot enter this loop. */
++ if (cderrno) {
++ if (nlinks) {
++ p->fts_info = FTS_NS;
++ p->fts_errno = cderrno;
++ } else
++ p->fts_info = FTS_NSOK;
++ p->fts_accpath = cur->fts_accpath;
++ } else
++#endif
++ if (nlinks == 0
++#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
++ || (nostat &&
++ dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
++#endif
++ ) {
++ p->fts_accpath =
++ ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
++ p->fts_info = FTS_NSOK;
++ } else {
++ /* Build a file name for fts_stat to stat. */
++ if (ISSET(FTS_NOCHDIR)) {
++ p->fts_accpath = p->fts_path;
++ memmove(cp, p->fts_name, p->fts_namelen + 1);
++ } else
++ p->fts_accpath = p->fts_name;
++ /* Stat it. */
++ p->fts_info = fts_stat(sp, p, 0);
++
++ /* Decrement link count if applicable. */
++ if (nlinks > 0 && (p->fts_info == FTS_D ||
++ p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
++ --nlinks;
++ }
++
++ /* We walk in directory order so "ls -f" doesn't get upset. */
++ p->fts_link = NULL;
++ if (head == NULL)
++ head = tail = p;
++ else {
++ tail->fts_link = p;
++ tail = p;
++ }
++ ++nitems;
++ }
++ if (dirp)
++ (void)closedir(dirp);
++
++ /*
++ * If realloc() changed the address of the path, adjust the
++ * addresses for the rest of the tree and the dir list.
++ */
++ if (doadjust)
++ fts_padjust(sp, head);
++
++ /*
++ * If not changing directories, reset the path back to original
++ * state.
++ */
++ if (ISSET(FTS_NOCHDIR)) {
++ if (len == sp->fts_pathlen || nitems == 0)
++ --cp;
++ *cp = '\0';
++ }
++
++ /*
++ * If descended after called from fts_children or after called from
++ * fts_read and nothing found, get back. At the root level we use
++ * the saved fd; if one of fts_open()'s arguments is a relative path
++ * to an empty directory, we wind up here with no other way back. If
++ * can't get back, we're done.
++ */
++ if (descend && (type == BCHILD || !nitems) &&
++ (cur->fts_level == FTS_ROOTLEVEL ?
++ FCHDIR(sp, sp->fts_rfd) :
++ fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
++ cur->fts_info = FTS_ERR;
++ SET(FTS_STOP);
++ fts_lfree(head);
++ return (NULL);
++ }
++
++ /* If didn't find anything, return NULL. */
++ if (!nitems) {
++ if (type == BREAD)
++ cur->fts_info = FTS_DP;
++ fts_lfree(head);
++ return (NULL);
++ }
++
++ /* Sort the entries. */
++ if (sp->fts_compar && nitems > 1)
++ head = fts_sort(sp, head, nitems);
++ return (head);
++}
++
++static u_short
++fts_stat(FTS *sp, register FTSENT *p, int follow)
++{
++ register FTSENT *t;
++ register dev_t dev;
++ register ino_t ino;
++ struct stat *sbp, sb;
++ int saved_errno;
++
++ /* If user needs stat info, stat buffer already allocated. */
++ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
++
++#if defined FTS_WHITEOUT && 0
++ /* check for whiteout */
++ if (p->fts_flags & FTS_ISW) {
++ if (sbp != &sb) {
++ memset(sbp, '\0', sizeof (*sbp));
++ sbp->st_mode = S_IFWHT;
++ }
++ return (FTS_W);
++ }
++#endif
++
++ /*
++ * If doing a logical walk, or application requested FTS_FOLLOW, do
++ * a stat(2). If that fails, check for a non-existent symlink. If
++ * fail, set the errno from the stat call.
++ */
++ if (ISSET(FTS_LOGICAL) || follow) {
++ if (stat(p->fts_accpath, sbp)) {
++ saved_errno = errno;
++ if (!lstat(p->fts_accpath, sbp)) {
++ errno = 0;
++ return (FTS_SLNONE);
++ }
++ p->fts_errno = saved_errno;
++ goto err;
++ }
++ } else if (lstat(p->fts_accpath, sbp)) {
++ p->fts_errno = errno;
++err: memset(sbp, 0, sizeof(struct stat));
++ return (FTS_NS);
++ }
++
++ if (S_ISDIR(sbp->st_mode)) {
++ /*
++ * Set the device/inode. Used to find cycles and check for
++ * crossing mount points. Also remember the link count, used
++ * in fts_build to limit the number of stat calls. It is
++ * understood that these fields are only referenced if fts_info
++ * is set to FTS_D.
++ */
++ dev = p->fts_dev = sbp->st_dev;
++ ino = p->fts_ino = sbp->st_ino;
++ p->fts_nlink = sbp->st_nlink;
++
++ if (ISDOT(p->fts_name))
++ return (FTS_DOT);
++
++ /*
++ * Cycle detection is done by brute force when the directory
++ * is first encountered. If the tree gets deep enough or the
++ * number of symbolic links to directories is high enough,
++ * something faster might be worthwhile.
++ */
++ for (t = p->fts_parent;
++ t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
++ if (ino == t->fts_ino && dev == t->fts_dev) {
++ p->fts_cycle = t;
++ return (FTS_DC);
++ }
++ return (FTS_D);
++ }
++ if (S_ISLNK(sbp->st_mode))
++ return (FTS_SL);
++ if (S_ISREG(sbp->st_mode))
++ return (FTS_F);
++ return (FTS_DEFAULT);
++}
++
++static FTSENT *
++fts_sort(FTS *sp, FTSENT *head, register int nitems)
++{
++ register FTSENT **ap, *p;
++
++ /*
++ * Construct an array of pointers to the structures and call qsort(3).
++ * Reassemble the array in the order returned by qsort. If unable to
++ * sort for memory reasons, return the directory entries in their
++ * current order. Allocate enough space for the current needs plus
++ * 40 so don't realloc one entry at a time.
++ */
++ if (nitems > sp->fts_nitems) {
++ struct _ftsent **a;
++
++ sp->fts_nitems = nitems + 40;
++ if ((a = realloc(sp->fts_array,
++ (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
++ free(sp->fts_array);
++ sp->fts_array = NULL;
++ sp->fts_nitems = 0;
++ return (head);
++ }
++ sp->fts_array = a;
++ }
++ for (ap = sp->fts_array, p = head; p; p = p->fts_link)
++ *ap++ = p;
++ qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
++ for (head = *(ap = sp->fts_array); --nitems; ++ap)
++ ap[0]->fts_link = ap[1];
++ ap[0]->fts_link = NULL;
++ return (head);
++}
++
++static FTSENT *
++fts_alloc(FTS *sp, const char *name, size_t namelen)
++{
++ register FTSENT *p;
++ size_t len;
++
++ /*
++ * The file name is a variable length array and no stat structure is
++ * necessary if the user has set the nostat bit. Allocate the FTSENT
++ * structure, the file name and the stat structure in one chunk, but
++ * be careful that the stat structure is reasonably aligned. Since the
++ * fts_name field is declared to be of size 1, the fts_name pointer is
++ * namelen + 2 before the first possible address of the stat structure.
++ */
++ len = sizeof(FTSENT) + namelen;
++ if (!ISSET(FTS_NOSTAT))
++ len += sizeof(struct stat) + ALIGNBYTES;
++ if ((p = malloc(len)) == NULL)
++ return (NULL);
++
++ /* Copy the name and guarantee NUL termination. */
++ memmove(p->fts_name, name, namelen);
++ p->fts_name[namelen] = '\0';
++
++ if (!ISSET(FTS_NOSTAT))
++ p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2);
++ p->fts_namelen = namelen;
++ p->fts_path = sp->fts_path;
++ p->fts_errno = 0;
++ p->fts_flags = 0;
++ p->fts_instr = FTS_NOINSTR;
++ p->fts_number = 0;
++ p->fts_pointer = NULL;
++ return (p);
++}
++
++static void
++fts_lfree(register FTSENT *head)
++{
++ register FTSENT *p;
++
++ /* Free a linked list of structures. */
++ while ((p = head)) {
++ head = head->fts_link;
++ free(p);
++ }
++}
++
++/*
++ * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
++ * Most systems will allow creation of paths much longer than MAXPATHLEN, even
++ * though the kernel won't resolve them. Add the size (not just what's needed)
++ * plus 256 bytes so don't realloc the path 2 bytes at a time.
++ */
++static int
++fts_palloc(FTS *sp, size_t more)
++{
++ char *p;
++
++ sp->fts_pathlen += more + 256;
++ /*
++ * Check for possible wraparound. In an FTS, fts_pathlen is
++ * a signed int but in an FTSENT it is an unsigned short.
++ * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
++ */
++ if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
++ free(sp->fts_path);
++ sp->fts_path = NULL;
++ errno = ENAMETOOLONG;
++ return (1);
++ }
++ p = realloc(sp->fts_path, sp->fts_pathlen);
++ if (p == NULL) {
++ free(sp->fts_path);
++ sp->fts_path = NULL;
++ return 1;
++ }
++ sp->fts_path = p;
++ return 0;
++}
++
++/*
++ * When the path is realloc'd, have to fix all of the pointers in structures
++ * already returned.
++ */
++static void
++fts_padjust(FTS *sp, FTSENT *head)
++{
++ FTSENT *p;
++ char *addr = sp->fts_path;
++
++#define ADJUST(p) do { \
++ if ((p)->fts_accpath != (p)->fts_name) { \
++ (p)->fts_accpath = \
++ (char *)addr + ((p)->fts_accpath - (p)->fts_path); \
++ } \
++ (p)->fts_path = addr; \
++} while (0)
++ /* Adjust the current set of children. */
++ for (p = sp->fts_child; p; p = p->fts_link)
++ ADJUST(p);
++
++ /* Adjust the rest of the tree, including the current level. */
++ for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
++ ADJUST(p);
++ p = p->fts_link ? p->fts_link : p->fts_parent;
++ }
++}
++
++static size_t
++fts_maxarglen(char * const *argv)
++{
++ size_t len, max;
++
++ for (max = 0; *argv; ++argv)
++ if ((len = strlen(*argv)) > max)
++ max = len;
++ return (max + 1);
++}
++
++/*
++ * Change to dir specified by fd or p->fts_accpath without getting
++ * tricked by someone changing the world out from underneath us.
++ * Assumes p->fts_dev and p->fts_ino are filled in.
++ */
++static int
++fts_safe_changedir(FTS *sp, FTSENT *p, int fd, const char *path)
++{
++ int ret, oerrno, newfd;
++ struct stat64 sb;
++
++ newfd = fd;
++ if (ISSET(FTS_NOCHDIR))
++ return (0);
++ if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0)
++ return (-1);
++ if (fstat64(newfd, &sb)) {
++ ret = -1;
++ goto bail;
++ }
++ if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
++ errno = ENOENT; /* disinformation */
++ ret = -1;
++ goto bail;
++ }
++ ret = fchdir(newfd);
++bail:
++ oerrno = errno;
++ if (fd < 0)
++ (void)close(newfd);
++ errno = oerrno;
++ return (ret);
++}
+diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h
+--- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100
++++ b/libdwfl/fts_.h 2015-01-06 11:42:13.481640322 +0000
+@@ -0,0 +1,131 @@
++/*
++ * Copyright (c) 1989, 1993
++ * The Regents of the University of California. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * @(#)fts.h 8.3 (Berkeley) 8/14/94
++ */
++
++#ifndef _FTS_H
++#define _FTS_H 1
++
++#include <features.h>
++#include <sys/types.h>
++
++/* The fts interface is incompatible with the LFS interface which
++ transparently uses the 64-bit file access functions. */
++#ifdef __USE_FILE_OFFSET64
++# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
++#endif
++
++
++typedef struct {
++ struct _ftsent *fts_cur; /* current node */
++ struct _ftsent *fts_child; /* linked list of children */
++ struct _ftsent **fts_array; /* sort array */
++ dev_t fts_dev; /* starting device # */
++ char *fts_path; /* path for this descent */
++ int fts_rfd; /* fd for root */
++ int fts_pathlen; /* sizeof(path) */
++ int fts_nitems; /* elements in the sort array */
++ int (*fts_compar) (const void *, const void *); /* compare fn */
++
++#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */
++#define FTS_LOGICAL 0x0002 /* logical walk */
++#define FTS_NOCHDIR 0x0004 /* don't change directories */
++#define FTS_NOSTAT 0x0008 /* don't get stat info */
++#define FTS_PHYSICAL 0x0010 /* physical walk */
++#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */
++#define FTS_XDEV 0x0040 /* don't cross devices */
++#define FTS_WHITEOUT 0x0080 /* return whiteout information */
++#define FTS_OPTIONMASK 0x00ff /* valid user option mask */
++
++#define FTS_NAMEONLY 0x0100 /* (private) child names only */
++#define FTS_STOP 0x0200 /* (private) unrecoverable error */
++ int fts_options; /* fts_open options, global flags */
++} FTS;
++
++typedef struct _ftsent {
++ struct _ftsent *fts_cycle; /* cycle node */
++ struct _ftsent *fts_parent; /* parent directory */
++ struct _ftsent *fts_link; /* next file in directory */
++ long fts_number; /* local numeric value */
++ void *fts_pointer; /* local address value */
++ char *fts_accpath; /* access path */
++ char *fts_path; /* root path */
++ int fts_errno; /* errno for this node */
++ int fts_symfd; /* fd for symlink */
++ u_short fts_pathlen; /* strlen(fts_path) */
++ u_short fts_namelen; /* strlen(fts_name) */
++
++ ino_t fts_ino; /* inode */
++ dev_t fts_dev; /* device */
++ nlink_t fts_nlink; /* link count */
++
++#define FTS_ROOTPARENTLEVEL -1
++#define FTS_ROOTLEVEL 0
++ short fts_level; /* depth (-1 to N) */
++
++#define FTS_D 1 /* preorder directory */
++#define FTS_DC 2 /* directory that causes cycles */
++#define FTS_DEFAULT 3 /* none of the above */
++#define FTS_DNR 4 /* unreadable directory */
++#define FTS_DOT 5 /* dot or dot-dot */
++#define FTS_DP 6 /* postorder directory */
++#define FTS_ERR 7 /* error; errno is set */
++#define FTS_F 8 /* regular file */
++#define FTS_INIT 9 /* initialized only */
++#define FTS_NS 10 /* stat(2) failed */
++#define FTS_NSOK 11 /* no stat(2) requested */
++#define FTS_SL 12 /* symbolic link */
++#define FTS_SLNONE 13 /* symbolic link without target */
++#define FTS_W 14 /* whiteout object */
++ u_short fts_info; /* user flags for FTSENT structure */
++
++#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
++#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
++ u_short fts_flags; /* private flags for FTSENT structure */
++
++#define FTS_AGAIN 1 /* read node again */
++#define FTS_FOLLOW 2 /* follow symbolic link */
++#define FTS_NOINSTR 3 /* no instructions */
++#define FTS_SKIP 4 /* discard node */
++ u_short fts_instr; /* fts_set() instructions */
++
++ struct stat *fts_statp; /* stat(2) information */
++ char fts_name[1]; /* file name */
++} FTSENT;
++
++__BEGIN_DECLS
++FTSENT *fts_children (FTS *, int);
++int fts_close (FTS *);
++FTS *fts_open (char * const *, int,
++ int (*)(const FTSENT **, const FTSENT **));
++FTSENT *fts_read (FTS *);
++int fts_set (FTS *, FTSENT *, int) __THROW;
++__END_DECLS
++
++#endif /* fts.h */
+diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
+--- a/libdwfl/linux-kernel-modules.c 2014-11-22 22:43:52.000000000 +0000
++++ b/libdwfl/linux-kernel-modules.c 2015-01-06 11:44:25.610924805 +0000
+@@ -29,7 +29,11 @@
+ /* We include this before config.h because it can't handle _FILE_OFFSET_BITS.
+ Everything we need here is fine if its declarations just come first. */
+
++#ifdef HAVE_FTS_H
+ #include <fts.h>
++#else
++#include <fts_.h>
++#endif
+
+ #include <config.h>
+
+diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am
+--- a/libdwfl/Makefile.am 2014-06-17 19:51:09.000000000 +0100
++++ b/libdwfl/Makefile.am 2015-01-06 11:45:25.442959369 +0000
+@@ -79,6 +79,9 @@ endif
+ if LZMA
+ libdwfl_a_SOURCES += lzma.c
+ endif
++if !HAVE_FTS
++libdwfl_a_SOURCES += fts.c
++endif
+
+ libdwfl = $(libdw)
+ libdw = ../libdw/libdw.so
--- /dev/null
+Disable the build of the po/ directory
+
+Building the po/ directory complains that the scripts in there have
+been generated with gettext 0.17, while we use gettext 0.18 in
+Buildroot. Since we don't care that much about po files anyway, just
+disable the build of this directory.
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000
++++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000
+@@ -28,7 +28,7 @@ endif
+
+ # Add doc back when we have some real content.
+ SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
+- backends $(PROGS_SUBDIR) po tests
++ backends $(PROGS_SUBDIR) tests
+
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ COPYING COPYING-GPLV2 COPYING-LGPLV3
+++ /dev/null
-Add an implementation of the fts_*() functions
-
-The fts_*() functions are optional in uClibc, and not compiled in our
-default configuration. The best option would be to migrate this
-elfutils code to the nftw family of functions, but it requires quite
-some work.
-
-So we have several options here:
-
- *) Enable fts_*() functions in our default uClibc configuration. Not
- nice since only one package needs them (the help text of uClibc
- for fts_*() functions explicitly mention that they have been added
- to be able to build elfutils).
-
- *) Use gnulib, but it is quite heavy to setup, requires modifications
- to configure.ac, and other things.
-
- *) Copy the fts function from uClibc into elfutils source code. This
- is the solution used below. uClibc is LGPL, and elfutils is
- LGPL/GPL, so there should not be any licensing issue.
-
-Of course, the fts_*() functions are only built if they are not
-already provided by the C library.
-
-Based on the former patch by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -Nrup a/configure.ac b/configure.ac
---- a/configure.ac 2014-11-07 15:14:42.402119092 +0000
-+++ b/configure.ac 2014-11-07 15:16:50.161316781 +0000
-@@ -266,6 +266,10 @@ if test "$ac_cv_func_argp_parse" != yes;
- fi
- AC_SUBST(ARGP_LIBS)
-
-+AC_CHECK_HEADER([fts.h],
-+ AC_DEFINE([HAVE_FTS_H], [], [Define if <fts.h> is available in C library]))
-+AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes)
-+
- dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
- dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
- save_LIBS="$LIBS"
-diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c
---- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/libdwfl/fts.c 2014-11-07 15:25:08.325879956 +0000
-@@ -0,0 +1,1095 @@
-+/*-
-+ * Copyright (c) 1990, 1993, 1994
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/param.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <dirent.h>
-+#include <errno.h>
-+#include "fts_.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+/* Largest alignment size needed, minus one.
-+ Usually long double is the worst case. */
-+#ifndef ALIGNBYTES
-+#define ALIGNBYTES (__alignof__ (long double) - 1)
-+#endif
-+/* Align P to that size. */
-+#ifndef ALIGN
-+#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
-+#endif
-+
-+
-+static FTSENT *fts_alloc (FTS *, const char *, size_t);
-+static FTSENT *fts_build (FTS *, int);
-+static void fts_lfree (FTSENT *);
-+static void fts_load (FTS *, FTSENT *);
-+static size_t fts_maxarglen (char * const *);
-+static void fts_padjust (FTS *, FTSENT *);
-+static int fts_palloc (FTS *, size_t);
-+static FTSENT *fts_sort (FTS *, FTSENT *, int);
-+static u_short fts_stat (FTS *, FTSENT *, int);
-+static int fts_safe_changedir (FTS *, FTSENT *, int, const char *);
-+
-+#ifndef MAX
-+#define MAX(a, b) ({ __typeof__ (a) _a = (a); \
-+ __typeof__ (b) _b = (b); \
-+ _a > _b ? _a : _b; })
-+#endif
-+
-+#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-+
-+#define CLR(opt) (sp->fts_options &= ~(opt))
-+#define ISSET(opt) (sp->fts_options & (opt))
-+#define SET(opt) (sp->fts_options |= (opt))
-+
-+#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
-+
-+/* fts_build flags */
-+#define BCHILD 1 /* fts_children */
-+#define BNAMES 2 /* fts_children, names only */
-+#define BREAD 3 /* fts_read */
-+
-+FTS *
-+fts_open( char * const *argv, register int options,
-+ int (*compar) (const FTSENT **, const FTSENT **))
-+{
-+ register FTS *sp;
-+ register FTSENT *p, *root;
-+ register int nitems;
-+ FTSENT *parent = NULL;
-+ FTSENT *tmp = NULL;
-+
-+ /* Options check. */
-+ if (options & ~FTS_OPTIONMASK) {
-+ errno = EINVAL;
-+ return (NULL);
-+ }
-+
-+ /* Allocate/initialize the stream */
-+ if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
-+ return (NULL);
-+ memset(sp, 0, sizeof(FTS));
-+ sp->fts_compar = (int (*) (const void *, const void *)) compar;
-+ sp->fts_options = options;
-+
-+ /* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-+ if (ISSET(FTS_LOGICAL))
-+ SET(FTS_NOCHDIR);
-+
-+ /*
-+ * Start out with 1K of path space, and enough, in any case,
-+ * to hold the user's paths.
-+ */
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+ size_t maxarglen = fts_maxarglen(argv);
-+ if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
-+ goto mem1;
-+
-+ /* Allocate/initialize root's parent. */
-+ if (*argv != NULL) {
-+ if ((parent = fts_alloc(sp, "", 0)) == NULL)
-+ goto mem2;
-+ parent->fts_level = FTS_ROOTPARENTLEVEL;
-+ }
-+
-+ /* Allocate/initialize root(s). */
-+ for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
-+ /* Don't allow zero-length paths. */
-+ size_t len = strlen(*argv);
-+ if (len == 0) {
-+ errno = ENOENT;
-+ goto mem3;
-+ }
-+
-+ p = fts_alloc(sp, *argv, len);
-+ p->fts_level = FTS_ROOTLEVEL;
-+ p->fts_parent = parent;
-+ p->fts_accpath = p->fts_name;
-+ p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
-+
-+ /* Command-line "." and ".." are real directories. */
-+ if (p->fts_info == FTS_DOT)
-+ p->fts_info = FTS_D;
-+
-+ /*
-+ * If comparison routine supplied, traverse in sorted
-+ * order; otherwise traverse in the order specified.
-+ */
-+ if (compar) {
-+ p->fts_link = root;
-+ root = p;
-+ } else {
-+ p->fts_link = NULL;
-+ if (root == NULL)
-+ tmp = root = p;
-+ else {
-+ tmp->fts_link = p;
-+ tmp = p;
-+ }
-+ }
-+ }
-+ if (compar && nitems > 1)
-+ root = fts_sort(sp, root, nitems);
-+
-+ /*
-+ * Allocate a dummy pointer and make fts_read think that we've just
-+ * finished the node before the root(s); set p->fts_info to FTS_INIT
-+ * so that everything about the "current" node is ignored.
-+ */
-+ if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-+ goto mem3;
-+ sp->fts_cur->fts_link = root;
-+ sp->fts_cur->fts_info = FTS_INIT;
-+
-+ /*
-+ * If using chdir(2), grab a file descriptor pointing to dot to ensure
-+ * that we can get back here; this could be avoided for some paths,
-+ * but almost certainly not worth the effort. Slashes, symbolic links,
-+ * and ".." are all fairly nasty problems. Note, if we can't get the
-+ * descriptor we run anyway, just more slowly.
-+ */
-+ if (!ISSET(FTS_NOCHDIR)
-+ && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0)
-+ SET(FTS_NOCHDIR);
-+
-+ return (sp);
-+
-+mem3: fts_lfree(root);
-+ free(parent);
-+mem2: free(sp->fts_path);
-+mem1: free(sp);
-+ return (NULL);
-+}
-+
-+static void
-+fts_load(FTS *sp, register FTSENT *p)
-+{
-+ register int len;
-+ register char *cp;
-+
-+ /*
-+ * Load the stream structure for the next traversal. Since we don't
-+ * actually enter the directory until after the preorder visit, set
-+ * the fts_accpath field specially so the chdir gets done to the right
-+ * place and the user can access the first node. From fts_open it's
-+ * known that the path will fit.
-+ */
-+ len = p->fts_pathlen = p->fts_namelen;
-+ memmove(sp->fts_path, p->fts_name, len + 1);
-+ if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-+ len = strlen(++cp);
-+ memmove(p->fts_name, cp, len + 1);
-+ p->fts_namelen = len;
-+ }
-+ p->fts_accpath = p->fts_path = sp->fts_path;
-+ sp->fts_dev = p->fts_dev;
-+}
-+
-+int
-+fts_close(FTS *sp)
-+{
-+ register FTSENT *freep, *p;
-+ int saved_errno;
-+
-+ /*
-+ * This still works if we haven't read anything -- the dummy structure
-+ * points to the root list, so we step through to the end of the root
-+ * list which has a valid parent pointer.
-+ */
-+ if (sp->fts_cur) {
-+ for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-+ freep = p;
-+ p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
-+ free(freep);
-+ }
-+ free(p);
-+ }
-+
-+ /* Free up child linked list, sort array, path buffer. */
-+ if (sp->fts_child)
-+ fts_lfree(sp->fts_child);
-+ free(sp->fts_array);
-+ free(sp->fts_path);
-+
-+ /* Return to original directory, save errno if necessary. */
-+ if (!ISSET(FTS_NOCHDIR)) {
-+ saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-+ (void)close(sp->fts_rfd);
-+
-+ /* Set errno and return. */
-+ if (saved_errno != 0) {
-+ /* Free up the stream pointer. */
-+ free(sp);
-+ errno = saved_errno;
-+ return (-1);
-+ }
-+ }
-+
-+ /* Free up the stream pointer. */
-+ free(sp);
-+ return (0);
-+}
-+
-+/*
-+ * Special case of "/" at the end of the path so that slashes aren't
-+ * appended which would cause paths to be written as "....//foo".
-+ */
-+#define NAPPEND(p) \
-+ (p->fts_path[p->fts_pathlen - 1] == '/' \
-+ ? p->fts_pathlen - 1 : p->fts_pathlen)
-+
-+FTSENT *
-+fts_read(register FTS *sp)
-+{
-+ register FTSENT *p, *tmp;
-+ register int instr;
-+ register char *t;
-+ int saved_errno;
-+
-+ /* If finished or unrecoverable error, return NULL. */
-+ if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-+ return (NULL);
-+
-+ /* Set current node pointer. */
-+ p = sp->fts_cur;
-+
-+ /* Save and zero out user instructions. */
-+ instr = p->fts_instr;
-+ p->fts_instr = FTS_NOINSTR;
-+
-+ /* Any type of file may be re-visited; re-stat and re-turn. */
-+ if (instr == FTS_AGAIN) {
-+ p->fts_info = fts_stat(sp, p, 0);
-+ return (p);
-+ }
-+
-+ /*
-+ * Following a symlink -- SLNONE test allows application to see
-+ * SLNONE and recover. If indirecting through a symlink, have
-+ * keep a pointer to current location. If unable to get that
-+ * pointer, follow fails.
-+ */
-+ if (instr == FTS_FOLLOW &&
-+ (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-+ p->fts_info = fts_stat(sp, p, 1);
-+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-+ if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
-+ p->fts_errno = errno;
-+ p->fts_info = FTS_ERR;
-+ } else
-+ p->fts_flags |= FTS_SYMFOLLOW;
-+ }
-+ return (p);
-+ }
-+
-+ /* Directory in pre-order. */
-+ if (p->fts_info == FTS_D) {
-+ /* If skipped or crossed mount point, do post-order visit. */
-+ if (instr == FTS_SKIP ||
-+ (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-+ if (p->fts_flags & FTS_SYMFOLLOW)
-+ (void)close(p->fts_symfd);
-+ if (sp->fts_child) {
-+ fts_lfree(sp->fts_child);
-+ sp->fts_child = NULL;
-+ }
-+ p->fts_info = FTS_DP;
-+ return (p);
-+ }
-+
-+ /* Rebuild if only read the names and now traversing. */
-+ if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
-+ CLR(FTS_NAMEONLY);
-+ fts_lfree(sp->fts_child);
-+ sp->fts_child = NULL;
-+ }
-+
-+ /*
-+ * Cd to the subdirectory.
-+ *
-+ * If have already read and now fail to chdir, whack the list
-+ * to make the names come out right, and set the parent errno
-+ * so the application will eventually get an error condition.
-+ * Set the FTS_DONTCHDIR flag so that when we logically change
-+ * directories back to the parent we don't do a chdir.
-+ *
-+ * If haven't read do so. If the read fails, fts_build sets
-+ * FTS_STOP or the fts_info field of the node.
-+ */
-+ if (sp->fts_child != NULL) {
-+ if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-+ p->fts_errno = errno;
-+ p->fts_flags |= FTS_DONTCHDIR;
-+ for (p = sp->fts_child; p != NULL;
-+ p = p->fts_link)
-+ p->fts_accpath =
-+ p->fts_parent->fts_accpath;
-+ }
-+ } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-+ if (ISSET(FTS_STOP))
-+ return (NULL);
-+ return (p);
-+ }
-+ p = sp->fts_child;
-+ sp->fts_child = NULL;
-+ sp->fts_cur = p;
-+ goto name;
-+ }
-+
-+ /* Move to the next node on this level. */
-+next: tmp = p;
-+ if ((p = p->fts_link) != NULL) {
-+ sp->fts_cur = p;
-+ free(tmp);
-+
-+ /*
-+ * If reached the top, return to the original directory (or
-+ * the root of the tree), and load the paths for the next root.
-+ */
-+ if (p->fts_level == FTS_ROOTLEVEL) {
-+ if (FCHDIR(sp, sp->fts_rfd)) {
-+ SET(FTS_STOP);
-+ return (NULL);
-+ }
-+ fts_load(sp, p);
-+ return p;
-+ }
-+
-+ /*
-+ * User may have called fts_set on the node. If skipped,
-+ * ignore. If followed, get a file descriptor so we can
-+ * get back if necessary.
-+ */
-+ if (p->fts_instr == FTS_SKIP)
-+ goto next;
-+ if (p->fts_instr == FTS_FOLLOW) {
-+ p->fts_info = fts_stat(sp, p, 1);
-+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-+ if ((p->fts_symfd =
-+ open(".", O_RDONLY, 0)) < 0) {
-+ p->fts_errno = errno;
-+ p->fts_info = FTS_ERR;
-+ } else
-+ p->fts_flags |= FTS_SYMFOLLOW;
-+ }
-+ p->fts_instr = FTS_NOINSTR;
-+ }
-+
-+name: t = sp->fts_path + NAPPEND(p->fts_parent);
-+ *t++ = '/';
-+ memmove(t, p->fts_name, p->fts_namelen + 1);
-+ return p;
-+ }
-+
-+ /* Move up to the parent node. */
-+ p = tmp->fts_parent;
-+ sp->fts_cur = p;
-+ free(tmp);
-+
-+ if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-+ /*
-+ * Done; free everything up and set errno to 0 so the user
-+ * can distinguish between error and EOF.
-+ */
-+ free(p);
-+ errno = 0;
-+ return (sp->fts_cur = NULL);
-+ }
-+
-+ /* NUL terminate the pathname. */
-+ sp->fts_path[p->fts_pathlen] = '\0';
-+
-+ /*
-+ * Return to the parent directory. If at a root node or came through
-+ * a symlink, go back through the file descriptor. Otherwise, cd up
-+ * one directory.
-+ */
-+ if (p->fts_level == FTS_ROOTLEVEL) {
-+ if (FCHDIR(sp, sp->fts_rfd)) {
-+ SET(FTS_STOP);
-+ return (NULL);
-+ }
-+ } else if (p->fts_flags & FTS_SYMFOLLOW) {
-+ if (FCHDIR(sp, p->fts_symfd)) {
-+ saved_errno = errno;
-+ (void)close(p->fts_symfd);
-+ errno = saved_errno;
-+ SET(FTS_STOP);
-+ return (NULL);
-+ }
-+ (void)close(p->fts_symfd);
-+ } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-+ fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-+ SET(FTS_STOP);
-+ return (NULL);
-+ }
-+ p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-+ return p;
-+}
-+
-+/*
-+ * Fts_set takes the stream as an argument although it's not used in this
-+ * implementation; it would be necessary if anyone wanted to add global
-+ * semantics to fts using fts_set. An error return is allowed for similar
-+ * reasons.
-+ */
-+/* ARGSUSED */
-+int
-+fts_set(FTS *sp, FTSENT *p, int instr)
-+{
-+ if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-+ instr != FTS_NOINSTR && instr != FTS_SKIP) {
-+ errno = EINVAL;
-+ return (1);
-+ }
-+ p->fts_instr = instr;
-+ return (0);
-+}
-+
-+FTSENT *
-+fts_children(register FTS *sp, int instr)
-+{
-+ register FTSENT *p;
-+ int fd;
-+
-+ if (instr != 0 && instr != FTS_NAMEONLY) {
-+ errno = EINVAL;
-+ return (NULL);
-+ }
-+
-+ /* Set current node pointer. */
-+ p = sp->fts_cur;
-+
-+ /*
-+ * Errno set to 0 so user can distinguish empty directory from
-+ * an error.
-+ */
-+ errno = 0;
-+
-+ /* Fatal errors stop here. */
-+ if (ISSET(FTS_STOP))
-+ return (NULL);
-+
-+ /* Return logical hierarchy of user's arguments. */
-+ if (p->fts_info == FTS_INIT)
-+ return (p->fts_link);
-+
-+ /*
-+ * If not a directory being visited in pre-order, stop here. Could
-+ * allow FTS_DNR, assuming the user has fixed the problem, but the
-+ * same effect is available with FTS_AGAIN.
-+ */
-+ if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
-+ return (NULL);
-+
-+ /* Free up any previous child list. */
-+ if (sp->fts_child != NULL)
-+ fts_lfree(sp->fts_child);
-+
-+ if (instr == FTS_NAMEONLY) {
-+ SET(FTS_NAMEONLY);
-+ instr = BNAMES;
-+ } else
-+ instr = BCHILD;
-+
-+ /*
-+ * If using chdir on a relative path and called BEFORE fts_read does
-+ * its chdir to the root of a traversal, we can lose -- we need to
-+ * chdir into the subdirectory, and we don't know where the current
-+ * directory is, so we can't get back so that the upcoming chdir by
-+ * fts_read will work.
-+ */
-+ if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-+ ISSET(FTS_NOCHDIR))
-+ return (sp->fts_child = fts_build(sp, instr));
-+
-+ if ((fd = open(".", O_RDONLY, 0)) < 0)
-+ return (NULL);
-+ sp->fts_child = fts_build(sp, instr);
-+ if (fchdir(fd))
-+ return (NULL);
-+ (void)close(fd);
-+ return (sp->fts_child);
-+}
-+
-+/*
-+ * This is the tricky part -- do not casually change *anything* in here. The
-+ * idea is to build the linked list of entries that are used by fts_children
-+ * and fts_read. There are lots of special cases.
-+ *
-+ * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is
-+ * set and it's a physical walk (so that symbolic links can't be directories),
-+ * we can do things quickly. First, if it's a 4.4BSD file system, the type
-+ * of the file is in the directory entry. Otherwise, we assume that the number
-+ * of subdirectories in a node is equal to the number of links to the parent.
-+ * The former skips all stat calls. The latter skips stat calls in any leaf
-+ * directories and for any files after the subdirectories in the directory have
-+ * been found, cutting the stat calls by about 2/3.
-+ */
-+static FTSENT *
-+fts_build(register FTS *sp, int type)
-+{
-+ register struct dirent *dp;
-+ register FTSENT *p, *head;
-+ register int nitems;
-+ FTSENT *cur, *tail;
-+ DIR *dirp;
-+ void *oldaddr;
-+ int cderrno, descend, len, level, nlinks, saved_errno,
-+ nostat, doadjust;
-+ size_t maxlen;
-+ char *cp;
-+
-+ /* Set current node pointer. */
-+ cur = sp->fts_cur;
-+
-+ /*
-+ * Open the directory for reading. If this fails, we're done.
-+ * If being called from fts_read, set the fts_info field.
-+ */
-+#if defined FTS_WHITEOUT && 0
-+ if (ISSET(FTS_WHITEOUT))
-+ oflag = DTF_NODUP|DTF_REWIND;
-+ else
-+ oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
-+#else
-+# define opendir2(path, flag) opendir(path)
-+#endif
-+ if ((dirp = opendir2(cur->fts_accpath, oflag)) == NULL) {
-+ if (type == BREAD) {
-+ cur->fts_info = FTS_DNR;
-+ cur->fts_errno = errno;
-+ }
-+ return (NULL);
-+ }
-+
-+ /*
-+ * Nlinks is the number of possible entries of type directory in the
-+ * directory if we're cheating on stat calls, 0 if we're not doing
-+ * any stat calls at all, -1 if we're doing stats on everything.
-+ */
-+ if (type == BNAMES) {
-+ nlinks = 0;
-+ /* Be quiet about nostat, GCC. */
-+ nostat = 0;
-+ } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
-+ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
-+ nostat = 1;
-+ } else {
-+ nlinks = -1;
-+ nostat = 0;
-+ }
-+
-+#ifdef notdef
-+ (void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
-+ (void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
-+ ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
-+#endif
-+ /*
-+ * If we're going to need to stat anything or we want to descend
-+ * and stay in the directory, chdir. If this fails we keep going,
-+ * but set a flag so we don't chdir after the post-order visit.
-+ * We won't be able to stat anything, but we can still return the
-+ * names themselves. Note, that since fts_read won't be able to
-+ * chdir into the directory, it will have to return different path
-+ * names than before, i.e. "a/b" instead of "b". Since the node
-+ * has already been visited in pre-order, have to wait until the
-+ * post-order visit to return the error. There is a special case
-+ * here, if there was nothing to stat then it's not an error to
-+ * not be able to stat. This is all fairly nasty. If a program
-+ * needed sorted entries or stat information, they had better be
-+ * checking FTS_NS on the returned nodes.
-+ */
-+ cderrno = 0;
-+ if (nlinks || type == BREAD) {
-+ if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
-+ if (nlinks && type == BREAD)
-+ cur->fts_errno = errno;
-+ cur->fts_flags |= FTS_DONTCHDIR;
-+ descend = 0;
-+ cderrno = errno;
-+ (void)closedir(dirp);
-+ dirp = NULL;
-+ } else
-+ descend = 1;
-+ } else
-+ descend = 0;
-+
-+ /*
-+ * Figure out the max file name length that can be stored in the
-+ * current path -- the inner loop allocates more path as necessary.
-+ * We really wouldn't have to do the maxlen calculations here, we
-+ * could do them in fts_read before returning the path, but it's a
-+ * lot easier here since the length is part of the dirent structure.
-+ *
-+ * If not changing directories set a pointer so that can just append
-+ * each new name into the path.
-+ */
-+ len = NAPPEND(cur);
-+ if (ISSET(FTS_NOCHDIR)) {
-+ cp = sp->fts_path + len;
-+ *cp++ = '/';
-+ } else {
-+ /* GCC, you're too verbose. */
-+ cp = NULL;
-+ }
-+ len++;
-+ maxlen = sp->fts_pathlen - len;
-+
-+ level = cur->fts_level + 1;
-+
-+ /* Read the directory, attaching each entry to the `link' pointer. */
-+ doadjust = 0;
-+ for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
-+ if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-+ continue;
-+
-+ if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL)
-+ goto mem1;
-+ if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
-+ oldaddr = sp->fts_path;
-+ if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
-+ /*
-+ * No more memory for path or structures. Save
-+ * errno, free up the current structure and the
-+ * structures already allocated.
-+ */
-+mem1: saved_errno = errno;
-+ free(p);
-+ fts_lfree(head);
-+ (void)closedir(dirp);
-+ cur->fts_info = FTS_ERR;
-+ SET(FTS_STOP);
-+ errno = saved_errno;
-+ return (NULL);
-+ }
-+ /* Did realloc() change the pointer? */
-+ if (oldaddr != sp->fts_path) {
-+ doadjust = 1;
-+ if (ISSET(FTS_NOCHDIR))
-+ cp = sp->fts_path + len;
-+ }
-+ maxlen = sp->fts_pathlen - len;
-+ }
-+
-+ if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
-+ /*
-+ * In an FTSENT, fts_pathlen is a u_short so it is
-+ * possible to wraparound here. If we do, free up
-+ * the current structure and the structures already
-+ * allocated, then error out with ENAMETOOLONG.
-+ */
-+ free(p);
-+ fts_lfree(head);
-+ (void)closedir(dirp);
-+ cur->fts_info = FTS_ERR;
-+ SET(FTS_STOP);
-+ errno = ENAMETOOLONG;
-+ return (NULL);
-+ }
-+ p->fts_level = level;
-+ p->fts_parent = sp->fts_cur;
-+ p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
-+
-+#if defined FTS_WHITEOUT && 0
-+ if (dp->d_type == DT_WHT)
-+ p->fts_flags |= FTS_ISW;
-+#endif
-+
-+#if 0
-+ /* Unreachable code. cderrno is only ever set to a nonnull
-+ value if dirp is closed at the same time. But then we
-+ cannot enter this loop. */
-+ if (cderrno) {
-+ if (nlinks) {
-+ p->fts_info = FTS_NS;
-+ p->fts_errno = cderrno;
-+ } else
-+ p->fts_info = FTS_NSOK;
-+ p->fts_accpath = cur->fts_accpath;
-+ } else
-+#endif
-+ if (nlinks == 0
-+#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
-+ || (nostat &&
-+ dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-+#endif
-+ ) {
-+ p->fts_accpath =
-+ ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-+ p->fts_info = FTS_NSOK;
-+ } else {
-+ /* Build a file name for fts_stat to stat. */
-+ if (ISSET(FTS_NOCHDIR)) {
-+ p->fts_accpath = p->fts_path;
-+ memmove(cp, p->fts_name, p->fts_namelen + 1);
-+ } else
-+ p->fts_accpath = p->fts_name;
-+ /* Stat it. */
-+ p->fts_info = fts_stat(sp, p, 0);
-+
-+ /* Decrement link count if applicable. */
-+ if (nlinks > 0 && (p->fts_info == FTS_D ||
-+ p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-+ --nlinks;
-+ }
-+
-+ /* We walk in directory order so "ls -f" doesn't get upset. */
-+ p->fts_link = NULL;
-+ if (head == NULL)
-+ head = tail = p;
-+ else {
-+ tail->fts_link = p;
-+ tail = p;
-+ }
-+ ++nitems;
-+ }
-+ if (dirp)
-+ (void)closedir(dirp);
-+
-+ /*
-+ * If realloc() changed the address of the path, adjust the
-+ * addresses for the rest of the tree and the dir list.
-+ */
-+ if (doadjust)
-+ fts_padjust(sp, head);
-+
-+ /*
-+ * If not changing directories, reset the path back to original
-+ * state.
-+ */
-+ if (ISSET(FTS_NOCHDIR)) {
-+ if (len == sp->fts_pathlen || nitems == 0)
-+ --cp;
-+ *cp = '\0';
-+ }
-+
-+ /*
-+ * If descended after called from fts_children or after called from
-+ * fts_read and nothing found, get back. At the root level we use
-+ * the saved fd; if one of fts_open()'s arguments is a relative path
-+ * to an empty directory, we wind up here with no other way back. If
-+ * can't get back, we're done.
-+ */
-+ if (descend && (type == BCHILD || !nitems) &&
-+ (cur->fts_level == FTS_ROOTLEVEL ?
-+ FCHDIR(sp, sp->fts_rfd) :
-+ fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-+ cur->fts_info = FTS_ERR;
-+ SET(FTS_STOP);
-+ fts_lfree(head);
-+ return (NULL);
-+ }
-+
-+ /* If didn't find anything, return NULL. */
-+ if (!nitems) {
-+ if (type == BREAD)
-+ cur->fts_info = FTS_DP;
-+ fts_lfree(head);
-+ return (NULL);
-+ }
-+
-+ /* Sort the entries. */
-+ if (sp->fts_compar && nitems > 1)
-+ head = fts_sort(sp, head, nitems);
-+ return (head);
-+}
-+
-+static u_short
-+fts_stat(FTS *sp, register FTSENT *p, int follow)
-+{
-+ register FTSENT *t;
-+ register dev_t dev;
-+ register ino_t ino;
-+ struct stat *sbp, sb;
-+ int saved_errno;
-+
-+ /* If user needs stat info, stat buffer already allocated. */
-+ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
-+
-+#if defined FTS_WHITEOUT && 0
-+ /* check for whiteout */
-+ if (p->fts_flags & FTS_ISW) {
-+ if (sbp != &sb) {
-+ memset(sbp, '\0', sizeof (*sbp));
-+ sbp->st_mode = S_IFWHT;
-+ }
-+ return (FTS_W);
-+ }
-+#endif
-+
-+ /*
-+ * If doing a logical walk, or application requested FTS_FOLLOW, do
-+ * a stat(2). If that fails, check for a non-existent symlink. If
-+ * fail, set the errno from the stat call.
-+ */
-+ if (ISSET(FTS_LOGICAL) || follow) {
-+ if (stat(p->fts_accpath, sbp)) {
-+ saved_errno = errno;
-+ if (!lstat(p->fts_accpath, sbp)) {
-+ errno = 0;
-+ return (FTS_SLNONE);
-+ }
-+ p->fts_errno = saved_errno;
-+ goto err;
-+ }
-+ } else if (lstat(p->fts_accpath, sbp)) {
-+ p->fts_errno = errno;
-+err: memset(sbp, 0, sizeof(struct stat));
-+ return (FTS_NS);
-+ }
-+
-+ if (S_ISDIR(sbp->st_mode)) {
-+ /*
-+ * Set the device/inode. Used to find cycles and check for
-+ * crossing mount points. Also remember the link count, used
-+ * in fts_build to limit the number of stat calls. It is
-+ * understood that these fields are only referenced if fts_info
-+ * is set to FTS_D.
-+ */
-+ dev = p->fts_dev = sbp->st_dev;
-+ ino = p->fts_ino = sbp->st_ino;
-+ p->fts_nlink = sbp->st_nlink;
-+
-+ if (ISDOT(p->fts_name))
-+ return (FTS_DOT);
-+
-+ /*
-+ * Cycle detection is done by brute force when the directory
-+ * is first encountered. If the tree gets deep enough or the
-+ * number of symbolic links to directories is high enough,
-+ * something faster might be worthwhile.
-+ */
-+ for (t = p->fts_parent;
-+ t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-+ if (ino == t->fts_ino && dev == t->fts_dev) {
-+ p->fts_cycle = t;
-+ return (FTS_DC);
-+ }
-+ return (FTS_D);
-+ }
-+ if (S_ISLNK(sbp->st_mode))
-+ return (FTS_SL);
-+ if (S_ISREG(sbp->st_mode))
-+ return (FTS_F);
-+ return (FTS_DEFAULT);
-+}
-+
-+static FTSENT *
-+fts_sort(FTS *sp, FTSENT *head, register int nitems)
-+{
-+ register FTSENT **ap, *p;
-+
-+ /*
-+ * Construct an array of pointers to the structures and call qsort(3).
-+ * Reassemble the array in the order returned by qsort. If unable to
-+ * sort for memory reasons, return the directory entries in their
-+ * current order. Allocate enough space for the current needs plus
-+ * 40 so don't realloc one entry at a time.
-+ */
-+ if (nitems > sp->fts_nitems) {
-+ struct _ftsent **a;
-+
-+ sp->fts_nitems = nitems + 40;
-+ if ((a = realloc(sp->fts_array,
-+ (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
-+ free(sp->fts_array);
-+ sp->fts_array = NULL;
-+ sp->fts_nitems = 0;
-+ return (head);
-+ }
-+ sp->fts_array = a;
-+ }
-+ for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-+ *ap++ = p;
-+ qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
-+ for (head = *(ap = sp->fts_array); --nitems; ++ap)
-+ ap[0]->fts_link = ap[1];
-+ ap[0]->fts_link = NULL;
-+ return (head);
-+}
-+
-+static FTSENT *
-+fts_alloc(FTS *sp, const char *name, size_t namelen)
-+{
-+ register FTSENT *p;
-+ size_t len;
-+
-+ /*
-+ * The file name is a variable length array and no stat structure is
-+ * necessary if the user has set the nostat bit. Allocate the FTSENT
-+ * structure, the file name and the stat structure in one chunk, but
-+ * be careful that the stat structure is reasonably aligned. Since the
-+ * fts_name field is declared to be of size 1, the fts_name pointer is
-+ * namelen + 2 before the first possible address of the stat structure.
-+ */
-+ len = sizeof(FTSENT) + namelen;
-+ if (!ISSET(FTS_NOSTAT))
-+ len += sizeof(struct stat) + ALIGNBYTES;
-+ if ((p = malloc(len)) == NULL)
-+ return (NULL);
-+
-+ /* Copy the name and guarantee NUL termination. */
-+ memmove(p->fts_name, name, namelen);
-+ p->fts_name[namelen] = '\0';
-+
-+ if (!ISSET(FTS_NOSTAT))
-+ p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2);
-+ p->fts_namelen = namelen;
-+ p->fts_path = sp->fts_path;
-+ p->fts_errno = 0;
-+ p->fts_flags = 0;
-+ p->fts_instr = FTS_NOINSTR;
-+ p->fts_number = 0;
-+ p->fts_pointer = NULL;
-+ return (p);
-+}
-+
-+static void
-+fts_lfree(register FTSENT *head)
-+{
-+ register FTSENT *p;
-+
-+ /* Free a linked list of structures. */
-+ while ((p = head)) {
-+ head = head->fts_link;
-+ free(p);
-+ }
-+}
-+
-+/*
-+ * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
-+ * Most systems will allow creation of paths much longer than MAXPATHLEN, even
-+ * though the kernel won't resolve them. Add the size (not just what's needed)
-+ * plus 256 bytes so don't realloc the path 2 bytes at a time.
-+ */
-+static int
-+fts_palloc(FTS *sp, size_t more)
-+{
-+ char *p;
-+
-+ sp->fts_pathlen += more + 256;
-+ /*
-+ * Check for possible wraparound. In an FTS, fts_pathlen is
-+ * a signed int but in an FTSENT it is an unsigned short.
-+ * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
-+ */
-+ if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
-+ free(sp->fts_path);
-+ sp->fts_path = NULL;
-+ errno = ENAMETOOLONG;
-+ return (1);
-+ }
-+ p = realloc(sp->fts_path, sp->fts_pathlen);
-+ if (p == NULL) {
-+ free(sp->fts_path);
-+ sp->fts_path = NULL;
-+ return 1;
-+ }
-+ sp->fts_path = p;
-+ return 0;
-+}
-+
-+/*
-+ * When the path is realloc'd, have to fix all of the pointers in structures
-+ * already returned.
-+ */
-+static void
-+fts_padjust(FTS *sp, FTSENT *head)
-+{
-+ FTSENT *p;
-+ char *addr = sp->fts_path;
-+
-+#define ADJUST(p) do { \
-+ if ((p)->fts_accpath != (p)->fts_name) { \
-+ (p)->fts_accpath = \
-+ (char *)addr + ((p)->fts_accpath - (p)->fts_path); \
-+ } \
-+ (p)->fts_path = addr; \
-+} while (0)
-+ /* Adjust the current set of children. */
-+ for (p = sp->fts_child; p; p = p->fts_link)
-+ ADJUST(p);
-+
-+ /* Adjust the rest of the tree, including the current level. */
-+ for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-+ ADJUST(p);
-+ p = p->fts_link ? p->fts_link : p->fts_parent;
-+ }
-+}
-+
-+static size_t
-+fts_maxarglen(char * const *argv)
-+{
-+ size_t len, max;
-+
-+ for (max = 0; *argv; ++argv)
-+ if ((len = strlen(*argv)) > max)
-+ max = len;
-+ return (max + 1);
-+}
-+
-+/*
-+ * Change to dir specified by fd or p->fts_accpath without getting
-+ * tricked by someone changing the world out from underneath us.
-+ * Assumes p->fts_dev and p->fts_ino are filled in.
-+ */
-+static int
-+fts_safe_changedir(FTS *sp, FTSENT *p, int fd, const char *path)
-+{
-+ int ret, oerrno, newfd;
-+ struct stat64 sb;
-+
-+ newfd = fd;
-+ if (ISSET(FTS_NOCHDIR))
-+ return (0);
-+ if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0)
-+ return (-1);
-+ if (fstat64(newfd, &sb)) {
-+ ret = -1;
-+ goto bail;
-+ }
-+ if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
-+ errno = ENOENT; /* disinformation */
-+ ret = -1;
-+ goto bail;
-+ }
-+ ret = fchdir(newfd);
-+bail:
-+ oerrno = errno;
-+ if (fd < 0)
-+ (void)close(newfd);
-+ errno = oerrno;
-+ return (ret);
-+}
-diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h
---- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/libdwfl/fts_.h 2014-11-07 15:26:00.806777392 +0000
-@@ -0,0 +1,131 @@
-+/*
-+ * Copyright (c) 1989, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * @(#)fts.h 8.3 (Berkeley) 8/14/94
-+ */
-+
-+#ifndef _FTS_H
-+#define _FTS_H 1
-+
-+#include <features.h>
-+#include <sys/types.h>
-+
-+/* The fts interface is incompatible with the LFS interface which
-+ transparently uses the 64-bit file access functions. */
-+#ifdef __USE_FILE_OFFSET64
-+# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
-+#endif
-+
-+
-+typedef struct {
-+ struct _ftsent *fts_cur; /* current node */
-+ struct _ftsent *fts_child; /* linked list of children */
-+ struct _ftsent **fts_array; /* sort array */
-+ dev_t fts_dev; /* starting device # */
-+ char *fts_path; /* path for this descent */
-+ int fts_rfd; /* fd for root */
-+ int fts_pathlen; /* sizeof(path) */
-+ int fts_nitems; /* elements in the sort array */
-+ int (*fts_compar) (const void *, const void *); /* compare fn */
-+
-+#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */
-+#define FTS_LOGICAL 0x0002 /* logical walk */
-+#define FTS_NOCHDIR 0x0004 /* don't change directories */
-+#define FTS_NOSTAT 0x0008 /* don't get stat info */
-+#define FTS_PHYSICAL 0x0010 /* physical walk */
-+#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */
-+#define FTS_XDEV 0x0040 /* don't cross devices */
-+#define FTS_WHITEOUT 0x0080 /* return whiteout information */
-+#define FTS_OPTIONMASK 0x00ff /* valid user option mask */
-+
-+#define FTS_NAMEONLY 0x0100 /* (private) child names only */
-+#define FTS_STOP 0x0200 /* (private) unrecoverable error */
-+ int fts_options; /* fts_open options, global flags */
-+} FTS;
-+
-+typedef struct _ftsent {
-+ struct _ftsent *fts_cycle; /* cycle node */
-+ struct _ftsent *fts_parent; /* parent directory */
-+ struct _ftsent *fts_link; /* next file in directory */
-+ long fts_number; /* local numeric value */
-+ void *fts_pointer; /* local address value */
-+ char *fts_accpath; /* access path */
-+ char *fts_path; /* root path */
-+ int fts_errno; /* errno for this node */
-+ int fts_symfd; /* fd for symlink */
-+ u_short fts_pathlen; /* strlen(fts_path) */
-+ u_short fts_namelen; /* strlen(fts_name) */
-+
-+ ino_t fts_ino; /* inode */
-+ dev_t fts_dev; /* device */
-+ nlink_t fts_nlink; /* link count */
-+
-+#define FTS_ROOTPARENTLEVEL -1
-+#define FTS_ROOTLEVEL 0
-+ short fts_level; /* depth (-1 to N) */
-+
-+#define FTS_D 1 /* preorder directory */
-+#define FTS_DC 2 /* directory that causes cycles */
-+#define FTS_DEFAULT 3 /* none of the above */
-+#define FTS_DNR 4 /* unreadable directory */
-+#define FTS_DOT 5 /* dot or dot-dot */
-+#define FTS_DP 6 /* postorder directory */
-+#define FTS_ERR 7 /* error; errno is set */
-+#define FTS_F 8 /* regular file */
-+#define FTS_INIT 9 /* initialized only */
-+#define FTS_NS 10 /* stat(2) failed */
-+#define FTS_NSOK 11 /* no stat(2) requested */
-+#define FTS_SL 12 /* symbolic link */
-+#define FTS_SLNONE 13 /* symbolic link without target */
-+#define FTS_W 14 /* whiteout object */
-+ u_short fts_info; /* user flags for FTSENT structure */
-+
-+#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
-+#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
-+ u_short fts_flags; /* private flags for FTSENT structure */
-+
-+#define FTS_AGAIN 1 /* read node again */
-+#define FTS_FOLLOW 2 /* follow symbolic link */
-+#define FTS_NOINSTR 3 /* no instructions */
-+#define FTS_SKIP 4 /* discard node */
-+ u_short fts_instr; /* fts_set() instructions */
-+
-+ struct stat *fts_statp; /* stat(2) information */
-+ char fts_name[1]; /* file name */
-+} FTSENT;
-+
-+__BEGIN_DECLS
-+FTSENT *fts_children (FTS *, int);
-+int fts_close (FTS *);
-+FTS *fts_open (char * const *, int,
-+ int (*)(const FTSENT **, const FTSENT **));
-+FTSENT *fts_read (FTS *);
-+int fts_set (FTS *, FTSENT *, int) __THROW;
-+__END_DECLS
-+
-+#endif /* fts.h */
-diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
---- a/libdwfl/linux-kernel-modules.c 2014-08-27 10:25:17.000000000 +0100
-+++ b/libdwfl/linux-kernel-modules.c 2014-11-07 15:27:10.783974209 +0000
-@@ -29,7 +29,11 @@
- /* We include this before config.h because it can't handle _FILE_OFFSET_BITS.
- Everything we need here is fine if its declarations just come first. */
-
-+#ifdef HAVE_FTS_H
- #include <fts.h>
-+#else
-+#include "fts_.h"
-+#endif
-
- #include <config.h>
-
-diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am
---- a/libdwfl/Makefile.am 2014-08-27 10:25:17.000000000 +0100
-+++ b/libdwfl/Makefile.am 2014-11-07 15:17:57.682478408 +0000
-@@ -79,6 +79,9 @@ endif
- if LZMA
- libdwfl_a_SOURCES += lzma.c
- endif
-+if !HAVE_FTS
-+libdwfl_a_SOURCES += fts.c
-+endif
-
- libdwfl = $(libdw)
- libdw = ../libdw/libdw.so
+++ /dev/null
-Disable the build of the po/ directory
-
-Building the po/ directory complains that the scripts in there have
-been generated with gettext 0.17, while we use gettext 0.18 in
-Buildroot. Since we don't care that much about po files anyway, just
-disable the build of this directory.
-
-Based on the former patch by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/Makefile.am b/Makefile.am
---- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000
-+++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000
-@@ -28,7 +28,7 @@ endif
-
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
-- backends $(PROGS_SUBDIR) po tests
-+ backends $(PROGS_SUBDIR) tests
-
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- COPYING COPYING-GPLV2 COPYING-LGPLV3
--- /dev/null
+Really make -Werror conditional to BUILD_WERROR
+
+Otherwise it will fail with an error message like this one:
+
+elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this
+function [-Werror=maybe-uninitialized]
+ arsym[n].as_name = NULL;
+ ^
+cc1: all warnings being treated as errors
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/config/eu.am b/config/eu.am
+--- a/config/eu.am 2014-11-10 16:19:14.356031479 +0000
++++ b/config/eu.am 2014-11-10 16:21:11.702072011 +0000
+@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
+- $(if $($(*F)_no_Werror),,-Werror) \
+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ $($(*F)_CFLAGS)
--- /dev/null
+Provide a compatibility alias __memcpy
+
+For some reason, libelf uses the internal glibc alias __memcpy, which
+doesn't exist in uClibc. Add a manual alias so that the build can
+proceed with uClibc.
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/libelf/libelf.h b/libelf/libelf.h
+--- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100
++++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000
+@@ -34,6 +34,11 @@
+ /* Get the ELF types. */
+ #include <elf.h>
+
++#ifndef _LIBC
++#ifndef __mempcpy
++#define __mempcpy mempcpy
++#endif
++#endif
+
+ /* Known translation types. */
+ typedef enum
+++ /dev/null
-Really make -Werror conditional to BUILD_WERROR
-
-Otherwise it will fail with an error message like this one:
-
-elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this
-function [-Werror=maybe-uninitialized]
- arsym[n].as_name = NULL;
- ^
-cc1: all warnings being treated as errors
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/config/eu.am b/config/eu.am
---- a/config/eu.am 2014-11-10 16:19:14.356031479 +0000
-+++ b/config/eu.am 2014-11-10 16:21:11.702072011 +0000
-@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
-- $(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
- $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
- $($(*F)_CFLAGS)
+++ /dev/null
-Provide a compatibility alias __memcpy
-
-For some reason, libelf uses the internal glibc alias __memcpy, which
-doesn't exist in uClibc. Add a manual alias so that the build can
-proceed with uClibc.
-
-Based on the former patch by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/libelf/libelf.h b/libelf/libelf.h
---- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100
-+++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000
-@@ -34,6 +34,11 @@
- /* Get the ELF types. */
- #include <elf.h>
-
-+#ifndef _LIBC
-+#ifndef __mempcpy
-+#define __mempcpy mempcpy
-+#endif
-+#endif
-
- /* Known translation types. */
- typedef enum
# Locally calculated
-sha256 741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1 elfutils-0.160.tar.bz2
+sha256 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070 elfutils-0.161.tar.bz2
+sha256 bf0363d03e1e4668778eb4e7ddd10e405a22f753b3ad813a537fc01164d1e3fe elfutils-portability-0.161.patch
#
################################################################################
-ELFUTILS_VERSION = 0.160
+ELFUTILS_VERSION = 0.161
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION)
ELFUTILS_INSTALL_STAGING = YES
ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3
ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
+ELFUTILS_PATCH = elfutils-portability-0.161.patch
# The tarball does not have a generated configure script
ELFUTILS_AUTORECONF = YES
projects / buildroot.git / commitdiff