--- elfutils/backends/ChangeLog

+++ elfutils/backends/ChangeLog

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

@@ -405,6 +409,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.

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

@@ -25,12 +25,14 @@

 ## <http://www.openinventionnetwork.com>.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"

+WEXTRA = @WEXTRA@

+LD_AS_NEEDED = @LD_AS_NEEDED@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

 AM_CFLAGS =

 endif

-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \

+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \

 	     -std=gnu99

 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \

 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \

@@ -115,7 +117,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map

 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\

 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \

 		-Wl,--version-script,$(word 2,$^) \

-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)

+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)

 	$(textrel_check)

 # XXX Should not be needed...

--- elfutils/backends/Makefile.in

+++ elfutils/backends/Makefile.in

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

@@ -192,6 +193,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

@@ -250,9 +252,9 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 zip_LIBS = @zip_LIBS@

 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \

-@MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99

+@MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99

 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \

-@MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2 -std=gnu99

+@MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99

 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \

 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \

 	   -I$(top_srcdir)/lib -I..

@@ -680,7 +682,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map

 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\

 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \

 		-Wl,--version-script,$(word 2,$^) \

-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)

+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)

 	$(textrel_check)

 # XXX Should not be needed...

--- elfutils/ChangeLog

+++ elfutils/ChangeLog

@@ -1,3 +1,7 @@

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

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

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

@@ -97,6 +107,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.

@@ -144,6 +158,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/Makefile.in

+++ elfutils/config/Makefile.in

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

@@ -105,6 +106,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

--- elfutils/config.h.in

+++ elfutils/config.h.in

@@ -1,5 +1,8 @@

 /* config.h.in.  Generated from configure.ac by autoheader.  */

+/* Have __builtin_popcount. */

+#undef HAVE_BUILTIN_POPCOUNT

+

 /* $libdir subdirectory containing libebl modules. */

 #undef LIBEBL_SUBDIR

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

@@ -646,6 +646,8 @@ NATIVE_LD_FALSE

 NATIVE_LD_TRUE

 DATADIRNAME

 LOCALEDIR

+LD_AS_NEEDED

+WEXTRA

 LEXLIB

 LEX_OUTPUT_ROOT

 LEX

@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su

 fi

+{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5

+$as_echo_n "checking for -Wextra option to $CC... " >&6; }

+if test "${ac_cv_cc_wextra+set}" = set; then

+  $as_echo_n "(cached) " >&6

+else

+  old_CFLAGS="$CFLAGS"

+CFLAGS="$CFLAGS -Wextra"

+cat >conftest.$ac_ext <<_ACEOF

+void foo (void) { }

+_ACEOF

+rm -f conftest.$ac_objext

+if { (ac_try="$ac_compile"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+$as_echo "$ac_try_echo") >&5

+  (eval "$ac_compile") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

+  ac_cv_cc_wextra=yes

+else

+  $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	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:$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:$LINENO: checking for -fgnu89-inline option to $CC" >&5

+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }

+if test "${ac_cv_cc_gnu89_inline+set}" = set; then

+  $as_echo_n "(cached) " >&6

+else

+  old_CFLAGS="$CFLAGS"

+CFLAGS="$CFLAGS -fgnu89-inline -Werror"

+cat >conftest.$ac_ext <<_ACEOF

+

+void foo (void)

+{

+  inline void bar (void) {}

+  bar ();

+}

+extern inline void baz (void) {}

+

+_ACEOF

+rm -f conftest.$ac_objext

+if { (ac_try="$ac_compile"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+$as_echo "$ac_try_echo") >&5

+  (eval "$ac_compile") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

+  ac_cv_cc_gnu89_inline=yes

+else

+  $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	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:$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:$LINENO: checking for --as-needed linker option" >&5

+$as_echo_n "checking for --as-needed linker option... " >&6; }

+if test "${ac_cv_as_needed+set}" = set; 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:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }

+then

+  ac_cv_as_needed=yes

+else

+  ac_cv_as_needed=no

+fi

+rm -f conftest*

+fi

+{ $as_echo "$as_me:$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:$LINENO: checking for __builtin_popcount" >&5

+$as_echo_n "checking for __builtin_popcount... " >&6; }

+if test "${ac_cv_popcount+set}" = set; then

+  $as_echo_n "(cached) " >&6

+else

+  cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+int

+main ()

+{

+exit (__builtin_popcount (127));

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

+$as_echo "$ac_try_echo") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext && {

+	 test "$cross_compiling" = yes ||

+	 $as_test_x conftest$ac_exeext

+       }; then

+  ac_cv_popcount=yes

+else

+  $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	ac_cv_popcount=no

+fi

+

+rm -rf conftest.dSYM

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+fi

+{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5

+$as_echo "$ac_cv_popcount" >&6; }

+if test "x$ac_cv_popcount" = xyes; then

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_BUILTIN_POPCOUNT 1

+_ACEOF

+

+fi

+

+

 { $as_echo "$as_me:$LINENO: checking for __thread support" >&5

 $as_echo_n "checking for __thread support... " >&6; }

 if test "${ac_cv_tls+set}" = set; then

@@ -4163,9 +4364,18 @@ fi

 { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5

 $as_echo "$ac_cv_tls" >&6; }

 if test "x$ac_cv_tls" != xyes; then

-  { { $as_echo "$as_me:$LINENO: error: __thread support required" >&5

-$as_echo "$as_me: error: __thread support required" >&2;}

+  if test "$use_locks" = yes; then

+  { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5

+$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;}

    { (exit 1); exit 1; }; }

+else

+

+cat >>confdefs.h <<\_ACEOF

+#define __thread /* empty: no multi-thread support */

+_ACEOF

+

+fi

+

 fi

@@ -5460,7 +5670,7 @@ ac_config_files="$ac_config_files versio

 # 1.234<whatever> -> 1234<whatever>

 case "$PACKAGE_VERSION" in

-[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;;

+[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;;

 *)     	   { { $as_echo "$as_me:$LINENO: error: confused by version number '$PACKAGE_VERSION'" >&5

 $as_echo "$as_me: error: confused by version number '$PACKAGE_VERSION'" >&2;}

    { (exit 1); exit 1; }; } ;;

@@ -5495,7 +5705,7 @@ $as_echo "$as_me: error: confused by ver

 esac

 # Round up to the next release API (x.y) version.

-eu_version=$[($eu_version + 999) / 1000]

+eu_version=`expr \( $eu_version + 999 \) / 1000`

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

--- elfutils/configure.ac

+++ elfutils/configure.ac

@@ -73,6 +73,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([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([

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

@@ -88,7 +136,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.])])])

 LOCALEDIR=$datadir

 AC_SUBST(LOCALEDIR)

@@ -259,7 +310,7 @@ AC_SUBST([eu_version])

 # 1.234<whatever> -> 1234<whatever>

 case "$PACKAGE_VERSION" in

-[[0-9]].*) eu_version="${PACKAGE_VERSION/./}" ;;

+[[0-9]].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;;

 *)     	   AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;;

 esac

 case "$eu_version" in

@@ -288,6 +339,6 @@ 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_OUTPUT

--- elfutils/lib/ChangeLog

+++ elfutils/lib/ChangeLog

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

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

@@ -182,6 +182,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.am

+++ elfutils/lib/Makefile.am

@@ -25,12 +25,13 @@

 ## <http://www.openinventionnetwork.com>.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

 AM_CFLAGS =

 endif

-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)

+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS)

 INCLUDES = -I$(srcdir)/../libelf -I..

 noinst_LIBRARIES = libeu.a

--- elfutils/lib/Makefile.in

+++ elfutils/lib/Makefile.in

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

@@ -127,6 +128,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

@@ -185,9 +187,9 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 zip_LIBS = @zip_LIBS@

 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \

-@MUDFLAP_FALSE@	-Wextra $($(*F)_CFLAGS)

+@MUDFLAP_FALSE@	$(WEXTRA) $($(*F)_CFLAGS)

 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \

-@MUDFLAP_TRUE@	-Wunused -Wextra $($(*F)_CFLAGS)

+@MUDFLAP_TRUE@	-Wunused $(WEXTRA) $($(*F)_CFLAGS)

 INCLUDES = -I$(srcdir)/../libelf -I..

 noinst_LIBRARIES = libeu.a

 libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \

--- elfutils/libasm/ChangeLog

+++ elfutils/libasm/ChangeLog

@@ -63,6 +63,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.am

+++ elfutils/libasm/Makefile.am

@@ -25,12 +25,13 @@

 ## <http://www.openinventionnetwork.com>.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

 AM_CFLAGS =

 endif

-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2

+AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2

 INCLUDES = -I. -I$(srcdir) -I.. \

 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\

 	   -I$(top_srcdir)/lib

--- elfutils/libasm/Makefile.in

+++ elfutils/libasm/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@

@@ -174,6 +175,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

@@ -232,9 +234,9 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 zip_LIBS = @zip_LIBS@

 @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \

-@MUDFLAP_FALSE@	-Wextra -Wformat=2

+@MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2

 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \

-@MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2

+@MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2

 INCLUDES = -I. -I$(srcdir) -I.. \

 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\

 	   -I$(top_srcdir)/lib

--- elfutils/libcpu/ChangeLog

+++ elfutils/libcpu/ChangeLog

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

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

@@ -791,6 +791,7 @@ i386_disasm (const uint8_t **startp, con

 			default:

 			  assert (! "INVALID not handled");

+			  abort ();

 			}

 		    }

 		  else

--- elfutils/libcpu/Makefile.am

+++ elfutils/libcpu/Makefile.am

@@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap

 else

 AM_CFLAGS =

 endif

-AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \

+WEXTRA = @WEXTRA@

+AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \

 	     -fdollars-in-identifiers \

 	     $($(*F)_CFLAGS) \

 	     $(if $($(*F)_no_Werror),,-Werror)

--- elfutils/libcpu/Makefile.in

+++ elfutils/libcpu/Makefile.in

@@ -114,6 +114,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.$(

@@ -143,6 +144,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

@@ -200,10 +202,11 @@ top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 zip_LIBS = @zip_LIBS@

-@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \

-@MUDFLAP_FALSE@	-fpic -fdollars-in-identifiers $($(*F)_CFLAGS) \

-@MUDFLAP_FALSE@	$(if $($(*F)_no_Werror),,-Werror)

-@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused -Wextra \

+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \

+@MUDFLAP_FALSE@	-std=gnu99 -fpic -fdollars-in-identifiers \

+@MUDFLAP_FALSE@	$($(*F)_CFLAGS) $(if \

+@MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror)

+@MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -Wunused $(WEXTRA) \

 @MUDFLAP_TRUE@	-std=gnu99 -fpic -fdollars-in-identifiers \

 @MUDFLAP_TRUE@	$($(*F)_CFLAGS) $(if \

 @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)

--- elfutils/libdw/ChangeLog

+++ elfutils/libdw/ChangeLog

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

@@ -817,6 +821,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/libdw.h

+++ elfutils/libdw/libdw.h

@@ -814,7 +814,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.am

+++ elfutils/libdw/Makefile.am

@@ -25,6 +25,7 @@

 ## <http://www.openinventionnetwork.com>.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

@@ -33,7 +34,7 @@ endif

 if BUILD_STATIC

 AM_CFLAGS += -fpic

 endif

-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99

+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99

 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib

 VERSION = 1

--- elfutils/libdw/Makefile.in

+++ elfutils/libdw/Makefile.in

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

@@ -216,6 +217,7 @@ SHELL = @SHELL@

 STRIP = @STRIP@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 XGETTEXT_015 = @XGETTEXT_015@

 YACC = @YACC@

@@ -274,9 +276,10 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 zip_LIBS = @zip_LIBS@

 @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \

-@MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99

+@MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99

 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \

-@MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99

+@MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 $(WEXTRA) \

+@MUDFLAP_TRUE@	-std=gnu99

 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib

 COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \

 						       $(COMPILE)))

--- elfutils/libdwfl/ChangeLog

+++ elfutils/libdwfl/ChangeLog

@@ -1165,6 +1165,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/Makefile.am

+++ elfutils/libdwfl/Makefile.am

@@ -27,12 +27,13 @@

 ## <http://www.openinventionnetwork.com>.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H