--- elfutils/backends/ChangeLog

+++ elfutils/backends/ChangeLog

@@ -364,6 +364,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

@@ -691,6 +695,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.

@@ -713,6 +722,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

@@ -148,6 +148,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>

@@ -166,6 +168,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>

@@ -187,6 +192,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.

@@ -195,6 +204,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.

@@ -206,6 +219,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

@@ -286,6 +301,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.

@@ -333,6 +352,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

@@ -58,6 +58,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

@@ -99,4 +102,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

@@ -4674,6 +4680,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 <

+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 :

@@ -4710,7 +4840,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.

@@ -5077,6 +5213,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

@@ -5800,7 +5952,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'

@@ -6530,6 +6682,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 <

+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)