--- elfutils/backends/ChangeLog

+++ elfutils/backends/ChangeLog

@@ -1,3 +1,8 @@

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

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

@@ -13,12 +13,14 @@

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

 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)/libelf -I$(top_srcdir)/libdw \

@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep

 libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)

 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--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)

 libebl_%.map: Makefile

--- elfutils/backends/Makefile.in

+++ elfutils/backends/Makefile.in

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

@@ -191,6 +192,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -233,9 +235,9 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @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)/libelf -I$(top_srcdir)/libdw \

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

@@ -583,7 +585,7 @@ uninstall-am: uninstall-info-am

 libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)

 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--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)

 libebl_%.map: Makefile

--- elfutils/ChangeLog

+++ elfutils/ChangeLog

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

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

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

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

@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

--- elfutils/configure

+++ elfutils/configure

@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.117'

 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'

 ac_unique_file="libelf/libelf.h"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'

+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'

 ac_subst_files=''

 # Initialize some variables set by options.

@@ -3385,6 +3385,92 @@ echo "$as_me: error: gcc with C99 suppor

 fi

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

+echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6

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

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  old_CFLAGS="$CFLAGS"

+CFLAGS="$CFLAGS -Wextra"

+cat >conftest.$ac_ext <<_ACEOF

+void foo (void) { }

+_ACEOF

+rm -f conftest.$ac_objext

+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>conftest.er1

+  ac_status=$?

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

+  rm -f conftest.er1

+  cat conftest.err >&5

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

+  (exit $ac_status); } &&

+	 { ac_try='test -z "$ac_c_werror_flag"

+			 || test ! -s conftest.err'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest.$ac_objext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+  ac_cv_cc_wextra=yes

+else

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

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

+

+ac_cv_cc_wextra=no

+fi

+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+CFLAGS="$old_CFLAGS"

+fi

+echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5

+echo "${ECHO_T}$ac_cv_cc_wextra" >&6

+

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

+  WEXTRA=-Wextra

+else

+  WEXTRA=-W

+fi

+

+

+echo "$as_me:$LINENO: checking for --as-needed linker option" >&5

+echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6

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

+  echo $ECHO_N "(cached) $ECHO_C" >&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=$?

+  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

+echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5

+echo "${ECHO_T}$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

+

+

+

+

 LOCALEDIR=$datadir

 cat >>confdefs.h <<_ACEOF

@@ -4987,6 +5073,8 @@ s,@YACC@,$YACC,;t t

 s,@LEX@,$LEX,;t t

 s,@LEXLIB@,$LEXLIB,;t t

 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t

+s,@WEXTRA@,$WEXTRA,;t t

+s,@LD_AS_NEEDED@,$LD_AS_NEEDED,;t t

 s,@LOCALEDIR@,$LOCALEDIR,;t t

 s,@DATADIRNAME@,$DATADIRNAME,;t t

 s,@NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t

--- elfutils/configure.ac

+++ elfutils/configure.ac

@@ -69,6 +69,34 @@ 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 --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)

+

+

 LOCALEDIR=$datadir

 AC_SUBST(LOCALEDIR)

 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")

--- elfutils/lib/ChangeLog

+++ elfutils/lib/ChangeLog

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

+++ elfutils/lib/Makefile.am

@@ -16,12 +16,13 @@

 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 ##

 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

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

@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -183,9 +185,9 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @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 = xstrdup.c xstrndup.c xmalloc.c next_prime.c \

--- elfutils/libasm/ChangeLog

+++ elfutils/libasm/ChangeLog

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

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

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

 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

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

@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @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

@@ -1,3 +1,8 @@

+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/Makefile.am

+++ elfutils/libcpu/Makefile.am

@@ -13,7 +13,8 @@

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H

-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused

+WEXTRA = @WEXTRA@

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

 INCLUDES = -I$(srcdir)

 noinst_LIBRARIES = libcpu_i386.a

--- elfutils/libcpu/Makefile.in

+++ elfutils/libcpu/Makefile.in

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

@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -177,7 +179,7 @@ sbindir = @sbindir@

 sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused

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

 INCLUDES = -I$(srcdir)

 noinst_LIBRARIES = libcpu_i386.a

 libcpu_i386_a_SOURCES = i386_dis.c

--- elfutils/libdw/ChangeLog

+++ elfutils/libdw/ChangeLog

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

+++ elfutils/libdw/Makefile.am

@@ -13,6 +13,7 @@

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

@@ -21,7 +22,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

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

@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @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

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

@@ -15,12 +15,13 @@

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

 AM_CFLAGS =

 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$(srcdir)/../libebl \

 	   -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib

 VERSION = 1

--- elfutils/libdwfl/Makefile.in

+++ elfutils/libdwfl/Makefile.in

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

@@ -170,6 +171,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -212,9 +214,9 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \

-@MUDFLAP_FALSE@	-Wextra -std=gnu99

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

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

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

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

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

 	   -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib

--- elfutils/libebl/ChangeLog

+++ elfutils/libebl/ChangeLog

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

+++ elfutils/libebl/Makefile.am

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

 ## 3001 King Ranch Road, Ukiah, CA 95482.

 ##

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

+WEXTRA = @WEXTRA@

 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)/libelf -I$(top_srcdir)/libdw \

--- elfutils/libebl/Makefile.in

+++ elfutils/libebl/Makefile.in

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

@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 @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)/libelf -I$(top_srcdir)/libdw \

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

--- elfutils/libelf/ChangeLog

+++ elfutils/libelf/ChangeLog

@@ -103,6 +103,11 @@

 	If section content hasn't been read yet, do it before looking for the

 	block size.  If no section data present, infer size of section header.

+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-11  Ulrich Drepper  <drepper@redhat.com>

 	* elf.h: Update again.

--- elfutils/libelf/common.h

+++ elfutils/libelf/common.h

@@ -122,7 +122,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))))

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

+++ elfutils/libelf/Makefile.am

@@ -16,6 +16,7 @@

 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

@@ -24,7 +25,10 @@ endif

 if BUILD_STATIC

 AM_CFLAGS += -fpic

 endif

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

+if BUILD_STATIC

+AM_CFLAGS += -fpic

+endif

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

 	     $($(*F)_CFLAGS)

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

 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)

--- elfutils/libelf/Makefile.in

+++ elfutils/libelf/Makefile.in

@@ -40,7 +40,7 @@ PRE_UNINSTALL = :

 POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

-@BUILD_STATIC_TRUE@am__append_1 = -fpic

+@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic

 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)

 @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =

 subdir = libelf

@@ -181,6 +181,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 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = 1

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

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

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

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

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

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

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

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

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

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

 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)

--- elfutils/m4/Makefile.in

+++ elfutils/m4/Makefile.in

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

@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

--- elfutils/Makefile.in

+++ elfutils/Makefile.in

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

@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@

 ac_ct_CC = @ac_ct_CC@

--- elfutils/src/ChangeLog

+++ elfutils/src/ChangeLog

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

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

+++ elfutils/src/Makefile.am

@@ -14,6 +14,7 @@

 ##

 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \

        -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"

+WEXTRA = @WEXTRA@

 if MUDFLAP

 AM_CFLAGS = -fmudflap

 else

@@ -21,7 +22,7 @@ AM_CFLAGS =

 endif

 AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \

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

-	     $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \

+	     $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \

 	     $(if $($(*F)_no_Wformat),,-Wformat=2)

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

--- elfutils/src/Makefile.in

+++ elfutils/src/Makefile.in

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

@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@

 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@

 USE_NLS = @USE_NLS@

 VERSION = @VERSION@

+WEXTRA = @WEXTRA@

 XGETTEXT = @XGETTEXT@

 YACC = @YACC@ -d

 ac_ct_CC = @ac_ct_CC@

@@ -271,12 +273,12 @@ target_alias = @target_alias@

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

 @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \

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

-@MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \

+@MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \

 @MUDFLAP_FALSE@	$($(*F)_no_Wformat),,-Wformat=2)

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

 @MUDFLAP_TRUE@	$(native_ld_cflags) $(if \

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

-@MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \

+@MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \

 @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2)

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

 	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \

--- elfutils/src/strip.c

+++ elfutils/src/strip.c

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

+

 /* Name and version of program.  */

 static void print_version (FILE *stream, struct argp_state *state);

@@ -288,8 +294,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;