418cfd0
--- elfutils/backends/ChangeLog
418cfd0
+++ elfutils/backends/ChangeLog
Mark J. Wielaard 22346cb
@@ -121,6 +121,10 @@
bfd3a36
 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
bfd3a36
 	GNU_Power_ABI_Struct_Return.
bfd3a36
 
5c16b08
+2009-01-23  Roland McGrath  <roland@redhat.com>
5c16b08
+
5c16b08
+	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
5c16b08
+
5c16b08
 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
5c16b08
 
5c16b08
 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
Mark J. Wielaard 22346cb
@@ -448,6 +452,11 @@
3025beb
 	* sparc_init.c: Likewise.
3025beb
 	* x86_64_init.c: Likewise.
3025beb
 
80ba80a
+2005-11-22  Roland McGrath  <roland@redhat.com>
80ba80a
+
80ba80a
+	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
80ba80a
+	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
80ba80a
+
80ba80a
 2005-11-19  Roland McGrath  <roland@redhat.com>
80ba80a
 
80ba80a
 	* ppc64_reloc.def: REL30 -> ADDR30.
Mark J. Wielaard 22346cb
@@ -470,6 +479,9 @@
418cfd0
 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
418cfd0
 	(CLEANFILES): Add libebl_$(m).so.
418cfd0
 
418cfd0
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
418cfd0
+	(AM_CFLAGS): Use it in place of -Wextra.
418cfd0
+
418cfd0
 	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
418cfd0
 	* ppc64_reloc.def: Likewise.
418cfd0
 
418cfd0
--- elfutils/backends/Makefile.am
418cfd0
+++ elfutils/backends/Makefile.am
Mark Wielaard d10bca5
@@ -105,7 +105,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
ba5f203
 	$(LINK) -shared -o $(@:.map=.so) \
ba5f203
 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
ba5f203
 		-Wl,--version-script,$(@:.so=.map) \
5c16b08
-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
5c16b08
+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
5c16b08
 	$(textrel_check)
5c16b08
 
ba5f203
 libebl_i386.so: $(cpu_i386)
418cfd0
--- elfutils/backends/Makefile.in
418cfd0
+++ elfutils/backends/Makefile.in
Mark J. Wielaard 22346cb
@@ -38,7 +38,8 @@ build_triplet = @build@
Mark J. Wielaard 22346cb
 host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 subdir = backends
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark J. Wielaard 22346cb
@@ -165,6 +166,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -194,6 +196,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
418cfd0
 USE_NLS = @USE_NLS@
418cfd0
 VERSION = @VERSION@
418cfd0
+WEXTRA = @WEXTRA@
418cfd0
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -256,10 +259,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
ba5f203
 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
0f58b0c
@@ -698,7 +700,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
ba5f203
 	$(LINK) -shared -o $(@:.map=.so) \
ba5f203
 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
ba5f203
 		-Wl,--version-script,$(@:.so=.map) \
5c16b08
-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
5c16b08
+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
5c16b08
 	$(textrel_check)
5c16b08
 
ba5f203
 libebl_i386.so: $(cpu_i386)
570047f
--- elfutils/ChangeLog
570047f
+++ elfutils/ChangeLog
Mark Wielaard d10bca5
@@ -4,6 +4,8 @@
Mark Wielaard d10bca5
 
Mark Wielaard d10bca5
 2012-01-24  Mark Wielaard  <mjw@redhat.com>
Mark Wielaard d10bca5
 
Mark Wielaard d10bca5
+	* configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.
Mark Wielaard d10bca5
+
Mark Wielaard d10bca5
 	* COPYING: Fix address. Updated version from gnulib.
Mark Wielaard d10bca5
 
Mark Wielaard d10bca5
 2012-01-23  Mark Wielaard  <mjw@redhat.com>
Mark Wielaard d10bca5
@@ -22,6 +24,9 @@
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 2011-10-08  Mike Frysinger  <vapier@gentoo.org>
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
+	* configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR
Mark J. Wielaard 22346cb
+	automake option.
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 2011-10-02  Ulrich Drepper  <drepper@gmail.com>
Mark Wielaard d10bca5
@@ -43,6 +48,10 @@
f790d25
 
f790d25
 	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
f790d25
 
8cafad5
+2009-11-22  Roland McGrath  <roland@redhat.com>
8cafad5
+
8cafad5
+	* configure.ac: Use sed and expr instead of modern bash extensions.
8cafad5
+
8cafad5
 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
8cafad5
 
8cafad5
 	* configure.ac: Update for more modern autoconf.
Mark Wielaard d10bca5
@@ -51,6 +60,10 @@
e4d1f5c
 
e4d1f5c
 	* configure.ac (zip_LIBS): Check for liblzma too.
e4d1f5c
 
e4d1f5c
+2009-08-17  Roland McGrath  <roland@redhat.com>
e4d1f5c
+
e4d1f5c
+	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
e4d1f5c
+
e4d1f5c
 2009-04-19  Roland McGrath  <roland@redhat.com>
e4d1f5c
 
e4d1f5c
 	* configure.ac (eu_version): Round down here, not in version.h macros.
Mark Wielaard d10bca5
@@ -62,6 +75,8 @@
fbfe249
 
bfd3a36
 2009-01-23  Roland McGrath  <roland@redhat.com>
bfd3a36
 
5c16b08
+	* configure.ac: Check for __builtin_popcount.
5c16b08
+
bfd3a36
 	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
5c16b08
 
bfd3a36
 	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
Mark Wielaard d10bca5
@@ -142,6 +157,10 @@
a997709
 	* configure.ac: Add dummy automake conditional to get dependencies
a997709
 	for non-generic linker right.  See src/Makefile.am.
a997709
 
80ba80a
+2005-11-22  Roland McGrath  <roland@redhat.com>
80ba80a
+
80ba80a
+	* configure.ac: Check for --as-needed linker option.
80ba80a
+
80ba80a
 2005-11-18  Roland McGrath  <roland@redhat.com>
80ba80a
 
80ba80a
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
Mark Wielaard d10bca5
@@ -189,6 +208,17 @@
f995fa8
 	* Makefile.am (all_SUBDIRS): Add libdwfl.
f995fa8
 	* configure.ac: Write libdwfl/Makefile.
f995fa8
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
6788433
+
6788433
+	* configure.ac (WEXTRA): Check for -Wextra and set this substitution.
6788433
+
28fe4de
+	* configure.ac: Check for struct stat st_?tim members.
28fe4de
+	* src/strip.c (process_file): Use st_?time if st_?tim are not there.
6788433
+
28fe4de
+	* configure.ac: Check for futimes function.
28fe4de
+	* src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
28fe4de
+	(handle_ar) [! HAVE_FUTIMES]: Likewise.
6788433
+
f995fa8
 2005-05-19  Roland McGrath  <roland@redhat.com>
6788433
 
f995fa8
 	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
Mark J. Wielaard 22346cb
--- elfutils/config/ChangeLog
Mark J. Wielaard 22346cb
+++ elfutils/config/ChangeLog
Mark Wielaard d10bca5
@@ -10,6 +10,10 @@
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 	* known-dwarf.awk: Use gawk.
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
+2011-10-08  Mike Frysinger  <vapier@gentoo.org>
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
+	* eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 2010-07-02  Ulrich Drepper  <drepper@redhat.com>
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 	* elfutils.spec.in: Add more BuildRequires.
ba5f203
--- elfutils/config/eu.am
ba5f203
+++ elfutils/config/eu.am
Mark J. Wielaard 22346cb
@@ -1,6 +1,6 @@
Mark J. Wielaard 22346cb
 ## Common automake fragments for elfutils subdirectory makefiles.
Mark J. Wielaard 22346cb
 ##
Mark J. Wielaard 22346cb
-## Copyright (C) 2010 Red Hat, Inc.
Mark J. Wielaard 22346cb
+## Copyright (C) 2010-2011 Red Hat, Inc.
Mark J. Wielaard 22346cb
 ##
Mark Wielaard d10bca5
 ## This file is part of elfutils.
Mark Wielaard d10bca5
 ##
Mark Wielaard d10bca5
@@ -29,14 +29,20 @@
Mark Wielaard d10bca5
 ## not, see <http://www.gnu.org/licenses/>.
ba5f203
 ##
ba5f203
 
ba5f203
+WEXTRA = @WEXTRA@
ba5f203
+LD_AS_NEEDED = @LD_AS_NEEDED@
ba5f203
+
f790d25
 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
ba5f203
 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
Mark J. Wielaard 22346cb
-	    $(if $($(*F)_no_Werror),,-Werror) \
ba5f203
-	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
ba5f203
+	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
ba5f203
 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
ba5f203
 	    $($(*F)_CFLAGS)
ba5f203
 
Mark J. Wielaard 22346cb
+if BUILD_WERROR
Mark J. Wielaard 22346cb
+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+endif
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 if MUDFLAP
Mark J. Wielaard 22346cb
 AM_CFLAGS += -fmudflap
Mark J. Wielaard 22346cb
 libmudflap = -lmudflap
570047f
--- elfutils/config/Makefile.in
570047f
+++ elfutils/config/Makefile.in
d36848b
@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
0f58b0c
@@ -105,6 +106,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
5c16b08
--- elfutils/config.h.in
5c16b08
+++ elfutils/config.h.in
Mark J. Wielaard 22346cb
@@ -3,6 +3,9 @@
Mark J. Wielaard 22346cb
 /* Should ar and ranlib use -D behavior by default? */
Mark J. Wielaard 22346cb
 #undef DEFAULT_AR_DETERMINISTIC
5c16b08
 
5c16b08
+/* Have __builtin_popcount. */
5c16b08
+#undef HAVE_BUILTIN_POPCOUNT
5c16b08
+
5c16b08
 /* $libdir subdirectory containing libebl modules. */
5c16b08
 #undef LIBEBL_SUBDIR
5c16b08
 
Mark J. Wielaard 22346cb
@@ -61,4 +64,7 @@
5c16b08
 /* Define for large files, on AIX-style hosts. */
5c16b08
 #undef _LARGE_FILES
5c16b08
 
5c16b08
+/* Stubbed out if missing compiler support. */
5c16b08
+#undef __thread
5c16b08
+
5c16b08
 #include <eu-config.h>
570047f
--- elfutils/configure
570047f
+++ elfutils/configure
Mark J. Wielaard 22346cb
@@ -598,6 +598,8 @@ ZLIB_TRUE
Mark J. Wielaard 22346cb
 LIBEBL_SUBDIR
Mark J. Wielaard 22346cb
 TESTS_RPATH_FALSE
Mark J. Wielaard 22346cb
 TESTS_RPATH_TRUE
Mark J. Wielaard 22346cb
+BUILD_WERROR_FALSE
Mark J. Wielaard 22346cb
+BUILD_WERROR_TRUE
Mark J. Wielaard 22346cb
 BUILD_STATIC_FALSE
Mark J. Wielaard 22346cb
 BUILD_STATIC_TRUE
Mark J. Wielaard 22346cb
 GCOV_FALSE
Mark J. Wielaard 22346cb
@@ -612,6 +614,8 @@ NEVER_TRUE
f790d25
 base_cpu
f790d25
 NATIVE_LD_FALSE
3cb5dfb
 NATIVE_LD_TRUE
28fe4de
+LD_AS_NEEDED
28fe4de
+WEXTRA
28fe4de
 LEXLIB
28fe4de
 LEX_OUTPUT_ROOT
28fe4de
 LEX
Mark J. Wielaard 22346cb
@@ -722,6 +726,7 @@ enable_mudflap
Mark J. Wielaard 22346cb
 enable_debugpred
Mark J. Wielaard 22346cb
 enable_gprof
Mark J. Wielaard 22346cb
 enable_gcov
Mark J. Wielaard 22346cb
+enable_werror
Mark J. Wielaard 22346cb
 enable_tests_rpath
Mark J. Wielaard 22346cb
 enable_libebl_subdir
Mark J. Wielaard 22346cb
 with_zlib
Mark J. Wielaard 22346cb
@@ -1373,6 +1378,7 @@ Optional Features:
Mark J. Wielaard 22346cb
                           prediction
Mark J. Wielaard 22346cb
   --enable-gprof          build binaries with gprof support
Mark J. Wielaard 22346cb
   --enable-gcov           build binaries with gcov support
Mark J. Wielaard 22346cb
+  --disable-werror        do not build with -Werror
Mark J. Wielaard 22346cb
   --enable-tests-rpath    build $ORIGIN-using rpath into tests
Mark J. Wielaard 22346cb
   --enable-libebl-subdir=DIR
Mark J. Wielaard 22346cb
                           install libebl_CPU modules in $(libdir)/DIR
Mark J. Wielaard 22346cb
@@ -3890,6 +3896,130 @@ if test "x$ac_cv_c99" != xyes; then :
Roland McGrath c025a9f
   as_fn_error $? "gcc with C99 support required" "$LINENO" 5
b73b6ec
 fi
b73b6ec
 
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
28fe4de
+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
Mark J. Wielaard 22346cb
+if ${ac_cv_cc_wextra+:} false; then :
bfd3a36
+  $as_echo_n "(cached) " >&6
bfd3a36
+else
b73b6ec
+  old_CFLAGS="$CFLAGS"
b73b6ec
+CFLAGS="$CFLAGS -Wextra"
0f58b0c
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
0f58b0c
+/* end confdefs.h.  */
b73b6ec
+void foo (void) { }
bfd3a36
+_ACEOF
0f58b0c
+if ac_fn_c_try_compile "$LINENO"; then :
b4dfabf
+  ac_cv_cc_wextra=yes
b73b6ec
+else
0f58b0c
+  ac_cv_cc_wextra=no
b73b6ec
+fi
3cb5dfb
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
b73b6ec
+CFLAGS="$old_CFLAGS"
b73b6ec
+fi
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
28fe4de
+$as_echo "$ac_cv_cc_wextra" >&6; }
b73b6ec
+
0f58b0c
+if test "x$ac_cv_cc_wextra" = xyes; then :
b73b6ec
+  WEXTRA=-Wextra
6788433
+else
6788433
+  WEXTRA=-W
b73b6ec
+fi
b73b6ec
+
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
e4d1f5c
+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
Mark J. Wielaard 22346cb
+if ${ac_cv_cc_gnu89_inline+:} false; then :
e4d1f5c
+  $as_echo_n "(cached) " >&6
e4d1f5c
+else
e4d1f5c
+  old_CFLAGS="$CFLAGS"
e4d1f5c
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
0f58b0c
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
0f58b0c
+/* end confdefs.h.  */
e4d1f5c
+
e4d1f5c
+void foo (void)
e4d1f5c
+{
e4d1f5c
+  inline void bar (void) {}
e4d1f5c
+  bar ();
e4d1f5c
+}
e4d1f5c
+extern inline void baz (void) {}
e4d1f5c
+
e4d1f5c
+_ACEOF
0f58b0c
+if ac_fn_c_try_compile "$LINENO"; then :
e4d1f5c
+  ac_cv_cc_gnu89_inline=yes
e4d1f5c
+else
0f58b0c
+  ac_cv_cc_gnu89_inline=no
e4d1f5c
+fi
e4d1f5c
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
e4d1f5c
+CFLAGS="$old_CFLAGS"
e4d1f5c
+fi
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
e4d1f5c
+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
0f58b0c
+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
e4d1f5c
+  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
e4d1f5c
+fi
e4d1f5c
+
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
28fe4de
+$as_echo_n "checking for --as-needed linker option... " >&6; }
Mark J. Wielaard 22346cb
+if ${ac_cv_as_needed+:} false; then :
28fe4de
+  $as_echo_n "(cached) " >&6
80ba80a
+else
80ba80a
+  cat > conftest.c <
80ba80a
+int main (void) { return 0; }
80ba80a
+EOF
80ba80a
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
80ba80a
+			    -fPIC -shared -o conftest.so conftest.c
80ba80a
+			    -Wl,--as-needed 1>&5'
0f58b0c
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
80ba80a
+  (eval $ac_try) 2>&5
80ba80a
+  ac_status=$?
0f58b0c
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
0f58b0c
+  test $ac_status = 0; }; }
80ba80a
+then
80ba80a
+  ac_cv_as_needed=yes
80ba80a
+else
80ba80a
+  ac_cv_as_needed=no
80ba80a
+fi
80ba80a
+rm -f conftest*
80ba80a
+fi
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
28fe4de
+$as_echo "$ac_cv_as_needed" >&6; }
0f58b0c
+if test "x$ac_cv_as_needed" = xyes; then :
80ba80a
+  LD_AS_NEEDED=-Wl,--as-needed
80ba80a
+else
80ba80a
+  LD_AS_NEEDED=
80ba80a
+fi
80ba80a
+
80ba80a
+
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
5c16b08
+$as_echo_n "checking for __builtin_popcount... " >&6; }
Mark J. Wielaard 22346cb
+if ${ac_cv_popcount+:} false; then :
5c16b08
+  $as_echo_n "(cached) " >&6
5c16b08
+else
0f58b0c
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5c16b08
+/* end confdefs.h.  */
80ba80a
+
5c16b08
+int
5c16b08
+main ()
5c16b08
+{
5c16b08
+exit (__builtin_popcount (127));
5c16b08
+  ;
5c16b08
+  return 0;
5c16b08
+}
5c16b08
+_ACEOF
0f58b0c
+if ac_fn_c_try_link "$LINENO"; then :
5c16b08
+  ac_cv_popcount=yes
5c16b08
+else
0f58b0c
+  ac_cv_popcount=no
5c16b08
+fi
0f58b0c
+rm -f core conftest.err conftest.$ac_objext \
0f58b0c
+    conftest$ac_exeext conftest.$ac_ext
5c16b08
+fi
0f58b0c
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
5c16b08
+$as_echo "$ac_cv_popcount" >&6; }
0f58b0c
+if test "x$ac_cv_popcount" = xyes; then :
5c16b08
+
0f58b0c
+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
5c16b08
+
5c16b08
+fi
5c16b08
+
0f58b0c
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
bfd3a36
 $as_echo_n "checking for __thread support... " >&6; }
Mark J. Wielaard 22346cb
 if ${ac_cv_tls+:} false; then :
Mark J. Wielaard 22346cb
@@ -3926,7 +4056,13 @@ fi
0f58b0c
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
5c16b08
 $as_echo "$ac_cv_tls" >&6; }
0f58b0c
 if test "x$ac_cv_tls" != xyes; then :
Roland McGrath c025a9f
-  as_fn_error $? "__thread support required" "$LINENO" 5
0f58b0c
+  if test "$use_locks" = yes; then :
Roland McGrath c025a9f
+  as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
5c16b08
+else
5c16b08
+
0f58b0c
+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
5c16b08
+
5c16b08
+fi
5c16b08
 fi
5c16b08
 
0f58b0c
 # Check whether --enable-largefile was given.
Mark J. Wielaard 22346cb
@@ -4275,6 +4411,22 @@ else
Mark J. Wielaard 22346cb
 fi
8cafad5
 
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
+# Check whether --enable-werror was given.
Mark J. Wielaard 22346cb
+if test "${enable_werror+set}" = set; then :
Mark J. Wielaard 22346cb
+  enableval=$enable_werror; enable_werror=$enableval
Mark J. Wielaard 22346cb
+else
Mark J. Wielaard 22346cb
+  enable_werror=yes
Mark J. Wielaard 22346cb
+fi
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
+ if test "$enable_werror" = yes; then
Mark J. Wielaard 22346cb
+  BUILD_WERROR_TRUE=
Mark J. Wielaard 22346cb
+  BUILD_WERROR_FALSE='#'
Mark J. Wielaard 22346cb
+else
Mark J. Wielaard 22346cb
+  BUILD_WERROR_TRUE='#'
Mark J. Wielaard 22346cb
+  BUILD_WERROR_FALSE=
Mark J. Wielaard 22346cb
+fi
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 # Check whether --enable-tests-rpath was given.
Mark J. Wielaard 22346cb
 if test "${enable_tests_rpath+set}" = set; then :
Mark J. Wielaard 22346cb
   enableval=$enable_tests_rpath; tests_use_rpath=$enableval
Mark J. Wielaard 22346cb
@@ -4995,7 +5147,7 @@ case "$eu_version" in
8cafad5
 esac
8cafad5
 
8cafad5
 # Round up to the next release API (x.y) version.
Mark J. Wielaard 22346cb
-eu_version=$(( (eu_version + 999) / 1000 ))
8cafad5
+eu_version=`expr \( $eu_version + 999 \) / 1000`
8cafad5
 
8cafad5
 cat >confcache <<\_ACEOF
8cafad5
 # This file is a shell script that caches the results of configure
Mark J. Wielaard 22346cb
@@ -5154,6 +5306,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
Mark J. Wielaard 22346cb
   as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
Mark J. Wielaard 22346cb
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
Mark J. Wielaard 22346cb
 fi
Mark J. Wielaard 22346cb
+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
Mark J. Wielaard 22346cb
+  as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
Mark J. Wielaard 22346cb
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
Mark J. Wielaard 22346cb
+fi
Mark J. Wielaard 22346cb
 if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
Mark J. Wielaard 22346cb
   as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
Mark J. Wielaard 22346cb
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
570047f
--- elfutils/configure.ac
570047f
+++ elfutils/configure.ac
Mark Wielaard d10bca5
@@ -82,6 +82,54 @@ CFLAGS="$old_CFLAGS"])
a769ac6
 AS_IF([test "x$ac_cv_c99" != xyes],
a769ac6
       AC_MSG_ERROR([gcc with C99 support required]))
a769ac6
 
a769ac6
+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
a769ac6
+old_CFLAGS="$CFLAGS"
a769ac6
+CFLAGS="$CFLAGS -Wextra"
Mark Wielaard d10bca5
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],
b4dfabf
+		  ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
a769ac6
+CFLAGS="$old_CFLAGS"])
a769ac6
+AC_SUBST(WEXTRA)
f995fa8
+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
a769ac6
+
e4d1f5c
+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
e4d1f5c
+old_CFLAGS="$CFLAGS"
e4d1f5c
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
Mark Wielaard d10bca5
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
e4d1f5c
+void foo (void)
e4d1f5c
+{
e4d1f5c
+  inline void bar (void) {}
e4d1f5c
+  bar ();
e4d1f5c
+}
e4d1f5c
+extern inline void baz (void) {}
Mark Wielaard d10bca5
+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
e4d1f5c
+CFLAGS="$old_CFLAGS"])
e4d1f5c
+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
e4d1f5c
+      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
e4d1f5c
+
80ba80a
+AC_CACHE_CHECK([for --as-needed linker option],
80ba80a
+	       ac_cv_as_needed, [dnl
80ba80a
+cat > conftest.c <
80ba80a
+int main (void) { return 0; }
80ba80a
+EOF
80ba80a
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
80ba80a
+			    -fPIC -shared -o conftest.so conftest.c
80ba80a
+			    -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
80ba80a
+then
80ba80a
+  ac_cv_as_needed=yes
80ba80a
+else
80ba80a
+  ac_cv_as_needed=no
80ba80a
+fi
80ba80a
+rm -f conftest*])
80ba80a
+AS_IF([test "x$ac_cv_as_needed" = xyes],
80ba80a
+      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
80ba80a
+AC_SUBST(LD_AS_NEEDED)
80ba80a
+
5c16b08
+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
5c16b08
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
5c16b08
+	       ac_cv_popcount=yes, ac_cv_popcount=no)])
5c16b08
+AS_IF([test "x$ac_cv_popcount" = xyes],
5c16b08
+      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
80ba80a
+
bfd3a36
 AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
bfd3a36
 # Use the same flags that we use for our DSOs, so the test is representative.
bfd3a36
 # Some old compiler/linker/libc combinations fail some ways and not others.
Mark Wielaard d10bca5
@@ -97,7 +145,10 @@ static __thread int a; int foo (int b) {
bfd3a36
 CFLAGS="$save_CFLAGS"
bfd3a36
 LDFLAGS="$save_LDFLAGS"])
5c16b08
 AS_IF([test "x$ac_cv_tls" != xyes],
bfd3a36
-      AC_MSG_ERROR([__thread support required]))
5c16b08
+      [AS_IF([test "$use_locks" = yes],
5c16b08
+	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
5c16b08
+	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
5c16b08
+			[Stubbed out if missing compiler support.])])])
5c16b08
 
f790d25
 dnl This test must come as early as possible after the compiler configuration
f790d25
 dnl tests, because the choice of the file model can (in principle) affect
Mark Wielaard d10bca5
@@ -185,6 +236,11 @@ AM_CONDITIONAL(GCOV, test "$use_gcov" =
Mark J. Wielaard 22346cb
 AM_CONDITIONAL(BUILD_STATIC, [dnl
Mark J. Wielaard 22346cb
 test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
+AC_ARG_ENABLE([werror],
Mark J. Wielaard 22346cb
+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),
Mark J. Wielaard 22346cb
+	       [enable_werror=$enableval], [enable_werror=yes])
Mark J. Wielaard 22346cb
+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 AC_ARG_ENABLE([tests-rpath],
Mark J. Wielaard 22346cb
 AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
Mark J. Wielaard 22346cb
 	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
Mark Wielaard d10bca5
@@ -296,6 +352,6 @@ case "$eu_version" in
8cafad5
 esac
8cafad5
 
8cafad5
 # Round up to the next release API (x.y) version.
Mark J. Wielaard 22346cb
-eu_version=$(( (eu_version + 999) / 1000 ))
8cafad5
+eu_version=`expr \( $eu_version + 999 \) / 1000`
8cafad5
 
8cafad5
 AC_OUTPUT
570047f
--- elfutils/lib/ChangeLog
570047f
+++ elfutils/lib/ChangeLog
Mark J. Wielaard 22346cb
@@ -35,6 +35,9 @@
e4d1f5c
 
bfd3a36
 2009-01-23  Roland McGrath  <roland@redhat.com>
bfd3a36
 
5c16b08
+	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
5c16b08
+	(__builtin_popcount): New inline function.
5c16b08
+
bfd3a36
 	* eu-config.h: Add multiple inclusion protection.
5c16b08
 
bfd3a36
 2009-01-17  Ulrich Drepper  <drepper@redhat.com>
Mark J. Wielaard 22346cb
@@ -91,6 +94,11 @@
5fa3867
 	* Makefile.am (libeu_a_SOURCES): Add it.
5fa3867
 	* system.h: Declare crc32_file.
5fa3867
 
a769ac6
+2005-02-07  Roland McGrath  <roland@redhat.com>
a769ac6
+
a769ac6
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
a769ac6
+	(AM_CFLAGS): Use it in place of -Wextra.
a769ac6
+
5fa3867
 2005-04-30  Ulrich Drepper  <drepper@redhat.com>
a769ac6
 
5fa3867
 	* Makefile.am: Use -ffunction-sections for xmalloc.c.
5c16b08
--- elfutils/lib/eu-config.h
5c16b08
+++ elfutils/lib/eu-config.h
Mark Wielaard d10bca5
@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
5c16b08
 /* This macro is used by the tests conditionalize for standalone building.  */
5c16b08
 #define ELFUTILS_HEADER(name) <lib##name.h>
bfd3a36
 
5c16b08
+#ifndef HAVE_BUILTIN_POPCOUNT
5c16b08
+# define __builtin_popcount hakmem_popcount
5c16b08
+static inline unsigned int __attribute__ ((unused))
5c16b08
+hakmem_popcount (unsigned int x)
5c16b08
+{
5c16b08
+  /* HAKMEM 169 */
5c16b08
+  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
5c16b08
+  return ((n + (n >> 3)) & 030707070707) % 63;
5c16b08
+}
5c16b08
+#endif	/* HAVE_BUILTIN_POPCOUNT */
5c16b08
+
bfd3a36
 
e4d1f5c
 #ifdef SHARED
e4d1f5c
 # define OLD_VERSION(name, version) \
570047f
--- elfutils/lib/Makefile.in
570047f
+++ elfutils/lib/Makefile.in
Mark J. Wielaard 22346cb
@@ -37,7 +37,8 @@ build_triplet = @build@
Mark J. Wielaard 22346cb
 host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 subdir = lib
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark J. Wielaard 22346cb
@@ -100,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -129,6 +131,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -190,10 +193,9 @@ zip_LIBS = @zip_LIBS@
Mark J. Wielaard 22346cb
 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
ba5f203
 	-I$(srcdir)/../libelf
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1) -fpic
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2) -fpic
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
f995fa8
--- elfutils/libasm/ChangeLog
f995fa8
+++ elfutils/libasm/ChangeLog
Roland McGrath c025a9f
@@ -71,6 +71,11 @@
2ca6928
 	* asm_error.c: Add new error ASM_E_IOERROR.
2ca6928
 	* libasmP.h: Add ASM_E_IOERROR definition.
2ca6928
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
f995fa8
 
2ca6928
 	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
570047f
--- elfutils/libasm/Makefile.in
570047f
+++ elfutils/libasm/Makefile.in
Mark J. Wielaard 22346cb
@@ -39,10 +39,11 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
Mark J. Wielaard 22346cb
 	$(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS =
Mark J. Wielaard 22346cb
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread
Mark J. Wielaard 22346cb
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
Mark J. Wielaard 22346cb
 subdir = libasm
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark J. Wielaard 22346cb
@@ -147,6 +148,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -176,6 +178,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = 1
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -238,10 +241,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
ba5f203
 	-I$(top_srcdir)/libdw
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
Mark J. Wielaard 22346cb
@@ -270,7 +272,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libasm_pic_a_SOURCES = 
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
Mark J. Wielaard 22346cb
-@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2)
Mark J. Wielaard 22346cb
+@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_3)
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libasm_so_SOURCES = 
Mark J. Wielaard 22346cb
 noinst_HEADERS = libasmP.h symbolhash.h
Mark J. Wielaard 22346cb
 EXTRA_DIST = libasm.map
570047f
--- elfutils/libcpu/ChangeLog
570047f
+++ elfutils/libcpu/ChangeLog
Mark Wielaard d10bca5
@@ -34,6 +34,9 @@
fbfe249
 
bfd3a36
 2009-01-23  Roland McGrath  <roland@redhat.com>
bfd3a36
 
5c16b08
+	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
5c16b08
+	compilers that don't realize it's noreturn.
5c16b08
+
bfd3a36
 	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
bfd3a36
 	substitution that can produce leading whitespace.
5c16b08
 
Mark Wielaard d10bca5
@@ -363,6 +366,11 @@
840723d
 	* defs/i386.doc: New file.
840723d
 	* defs/x86_64: New file.
840723d
 
6788433
+2005-04-04  Roland McGrath  <roland@redhat.com>
6788433
+
6788433
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
6788433
+	(AM_CFLAGS): Use it instead of -Wextra.
6788433
+
6788433
 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
6788433
 
6788433
 	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
5c16b08
--- elfutils/libcpu/i386_disasm.c
5c16b08
+++ elfutils/libcpu/i386_disasm.c
Mark Wielaard d10bca5
@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
5c16b08
 
5c16b08
 			default:
5c16b08
 			  assert (! "INVALID not handled");
5c16b08
+			  abort ();
5c16b08
 			}
5c16b08
 		    }
5c16b08
 		  else
570047f
--- elfutils/libcpu/Makefile.in
570047f
+++ elfutils/libcpu/Makefile.in
Mark J. Wielaard 22346cb
@@ -39,7 +39,8 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
Mark J. Wielaard 22346cb
 	i386_lex.c i386_parse.c
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
Mark J. Wielaard 22346cb
 subdir = libcpu
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
@@ -117,6 +118,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
840723d
 LEX_OUTPUT_ROOT = lex.$(
Mark J. Wielaard 22346cb
@@ -146,6 +148,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -208,10 +211,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
ba5f203
 	-I$(srcdir)/../libdw -I$(srcdir)/../libasm
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1) -fpic -fdollars-in-identifiers
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2) -fpic -fdollars-in-identifiers
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
f995fa8
--- elfutils/libdw/ChangeLog
f995fa8
+++ elfutils/libdw/ChangeLog
Mark Wielaard d10bca5
@@ -17,6 +17,10 @@
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
+2011-07-20  Mark Wielaard  <mjw@redhat.com>
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
+	* dwarf_begin_elf.c: Add fallback for be64toh if not defined.
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
 2011-07-14  Mark Wielaard  <mjw@redhat.com>
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
Mark Wielaard d10bca5
@@ -376,6 +380,10 @@
e4d1f5c
 
e4d1f5c
 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
e4d1f5c
 
e4d1f5c
+2009-08-17  Roland McGrath  <roland@redhat.com>
e4d1f5c
+
e4d1f5c
+	* libdw.h: Disable extern inlines for GCC 4.2.
e4d1f5c
+
e4d1f5c
 2009-08-10  Roland McGrath  <roland@redhat.com>
e4d1f5c
 
e4d1f5c
 	* dwarf_getscopevar.c: Use dwarf_diename.
Mark Wielaard d10bca5
@@ -1144,6 +1152,11 @@
f995fa8
 
f995fa8
 2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
 
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
 	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
f995fa8
 	formref offset.
f995fa8
 
Mark J. Wielaard 22346cb
--- elfutils/libdw/dwarf_begin_elf.c
Mark J. Wielaard 22346cb
+++ elfutils/libdw/dwarf_begin_elf.c
Mark Wielaard d10bca5
@@ -43,6 +43,14 @@
Mark J. Wielaard 22346cb
 #if USE_ZLIB
Mark J. Wielaard 22346cb
 # include <endian.h>
Mark J. Wielaard 22346cb
 # define crc32		loser_crc32
Mark J. Wielaard 22346cb
+# ifndef be64toh
Mark J. Wielaard 22346cb
+#  include <byteswap.h>
Mark J. Wielaard 22346cb
+#  if __BYTE_ORDER == __LITTLE_ENDIAN
Mark J. Wielaard 22346cb
+#   define be64toh(x) bswap_64 (x)
Mark J. Wielaard 22346cb
+#  else
Mark J. Wielaard 22346cb
+#   define be64toh(x) (x)
Mark J. Wielaard 22346cb
+#  endif
Mark J. Wielaard 22346cb
+# endif
Mark J. Wielaard 22346cb
 # include <zlib.h>
Mark J. Wielaard 22346cb
 # undef crc32
Mark J. Wielaard 22346cb
 #endif
e4d1f5c
--- elfutils/libdw/libdw.h
e4d1f5c
+++ elfutils/libdw/libdw.h
Mark Wielaard d10bca5
@@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
e4d1f5c
 
e4d1f5c
 
e4d1f5c
 /* Inline optimizations.  */
e4d1f5c
-#ifdef __OPTIMIZE__
e4d1f5c
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
e4d1f5c
 /* Return attribute code of given attribute.  */
e4d1f5c
 __libdw_extern_inline unsigned int
e4d1f5c
 dwarf_whatattr (Dwarf_Attribute *attr)
570047f
--- elfutils/libdw/Makefile.in
570047f
+++ elfutils/libdw/Makefile.in
Mark J. Wielaard 22346cb
@@ -39,8 +39,9 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
Mark J. Wielaard 22346cb
 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
-@BUILD_STATIC_TRUE@am__append_2 = -fpic
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_STATIC_TRUE@am__append_3 = -fpic
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =
Mark J. Wielaard 22346cb
 subdir = libdw
Mark J. Wielaard 22346cb
@@ -192,6 +193,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -221,6 +223,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = 1
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -282,10 +285,9 @@ zip_LIBS = @zip_LIBS@
Mark J. Wielaard 22346cb
 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
ba5f203
 	-I$(srcdir)/../libelf
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1) $(am__append_2)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2) $(am__append_3)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
f995fa8
--- elfutils/libdwfl/ChangeLog
f995fa8
+++ elfutils/libdwfl/ChangeLog
Mark Wielaard d10bca5
@@ -1416,6 +1416,11 @@
469b3c7
 
f995fa8
 2005-07-21  Roland McGrath  <roland@redhat.com>
f995fa8
 
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
+2005-07-21  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
 	* Makefile.am (noinst_HEADERS): Add loc2c.c.
f995fa8
 
f995fa8
 	* test2.c (main): Check sscanf result to quiet warning.
f995fa8
--- elfutils/libdwfl/Makefile.in
f995fa8
+++ elfutils/libdwfl/Makefile.in
Mark J. Wielaard 22346cb
@@ -38,11 +38,12 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
Mark J. Wielaard 22346cb
 	$(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
-@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a
Mark J. Wielaard 22346cb
-@ZLIB_TRUE@am__append_3 = gzip.c
Mark J. Wielaard 22346cb
-@BZLIB_TRUE@am__append_4 = bzip2.c
Mark J. Wielaard 22346cb
-@LZMA_TRUE@am__append_5 = lzma.c
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
+@MUDFLAP_FALSE@am__append_3 = libdwfl_pic.a
Mark J. Wielaard 22346cb
+@ZLIB_TRUE@am__append_4 = gzip.c
Mark J. Wielaard 22346cb
+@BZLIB_TRUE@am__append_5 = bzip2.c
Mark J. Wielaard 22346cb
+@LZMA_TRUE@am__append_6 = lzma.c
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =
Mark J. Wielaard 22346cb
 subdir = libdwfl
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
@@ -182,6 +183,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -211,6 +213,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
f995fa8
 USE_NLS = @USE_NLS@
f995fa8
 VERSION = 1
f995fa8
+WEXTRA = @WEXTRA@
f995fa8
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -273,10 +276,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
ba5f203
 	-I$(srcdir)/../libdw
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
Mark J. Wielaard 22346cb
@@ -284,7 +286,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
Mark J. Wielaard 22346cb
 textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
Mark J. Wielaard 22346cb
-noinst_LIBRARIES = libdwfl.a $(am__append_2)
Mark J. Wielaard 22346cb
+noinst_LIBRARIES = libdwfl.a $(am__append_3)
Mark J. Wielaard 22346cb
 pkginclude_HEADERS = libdwfl.h
Mark J. Wielaard 22346cb
 libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \
Mark J. Wielaard 22346cb
 	dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \
Mark J. Wielaard 22346cb
@@ -305,8 +307,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
Mark J. Wielaard 22346cb
 	dwfl_module_getsym.c dwfl_module_addrname.c \
Mark J. Wielaard 22346cb
 	dwfl_module_addrsym.c dwfl_module_return_value_location.c \
Mark J. Wielaard 22346cb
 	dwfl_module_register_names.c dwfl_segment_report_module.c \
Mark J. Wielaard 22346cb
-	link_map.c core-file.c open.c image-header.c $(am__append_3) \
Mark J. Wielaard 22346cb
-	$(am__append_4) $(am__append_5)
Mark J. Wielaard 22346cb
+	link_map.c core-file.c open.c image-header.c $(am__append_4) \
Mark J. Wielaard 22346cb
+	$(am__append_5) $(am__append_6)
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libdwfl = $(libdw)
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libdw = ../libdw/libdw.so
f995fa8
--- elfutils/libebl/ChangeLog
f995fa8
+++ elfutils/libebl/ChangeLog
Mark J. Wielaard 22346cb
@@ -650,6 +650,11 @@
f995fa8
 	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
f995fa8
 	tracking works right.
f995fa8
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
 2005-05-21  Ulrich Drepper  <drepper@redhat.com>
f995fa8
 
f995fa8
 	* libebl_x86_64.map: Add x86_64_core_note.
570047f
--- elfutils/libebl/Makefile.in
570047f
+++ elfutils/libebl/Makefile.in
Mark J. Wielaard 22346cb
@@ -38,7 +38,8 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
Mark J. Wielaard 22346cb
 	$(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 subdir = libebl
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark J. Wielaard 22346cb
@@ -144,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -173,6 +175,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = 1
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -235,10 +238,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(srcdir)/../libelf -I$(srcdir)/../libdw \
ba5f203
 	-I$(srcdir)/../libasm
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1) -fpic
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2) -fpic
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
f995fa8
--- elfutils/libelf/ChangeLog
f995fa8
+++ elfutils/libelf/ChangeLog
Mark Wielaard d10bca5
@@ -7,6 +7,11 @@
Mark Wielaard d10bca5
 
Mark Wielaard d10bca5
 	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
Mark Wielaard d10bca5
 
Mark J. Wielaard 22346cb
+2011-03-10  Roland McGrath  <roland@redhat.com>
Mark J. Wielaard 22346cb
+
Mark J. Wielaard 22346cb
+	* gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32
Mark J. Wielaard 22346cb
+	argument, since some implementations are buggy macros.
Mark J. Wielaard 22346cb
+
Mark Wielaard d10bca5
 2011-02-26  Mark Wielaard  <mjw@redhat.com>
Mark J. Wielaard 22346cb
 
Mark Wielaard d10bca5
 	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
Mark Wielaard d10bca5
@@ -684,6 +689,11 @@
5c16b08
 
5c16b08
 	* elf.h: Update from glibc.
469b3c7
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
5c16b08
 2005-05-08  Roland McGrath  <roland@redhat.com>
f995fa8
 
5c16b08
 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
f995fa8
--- elfutils/libelf/common.h
f995fa8
+++ elfutils/libelf/common.h
Mark Wielaard d10bca5
@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
f995fa8
   (Var) = (sizeof (Var) == 1						      \
f995fa8
 	   ? (unsigned char) (Var)					      \
f995fa8
 	   : (sizeof (Var) == 2						      \
f995fa8
-	      ? bswap_16 (Var)						      \
f995fa8
+	      ? (unsigned short int) bswap_16 (Var)			      \
f995fa8
 	      : (sizeof (Var) == 4					      \
f995fa8
 		 ? bswap_32 (Var)					      \
f995fa8
 		 : bswap_64 (Var))))
Mark Wielaard d10bca5
@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)
f995fa8
   (Dst) = (sizeof (Var) == 1						      \
f995fa8
 	   ? (unsigned char) (Var)					      \
f995fa8
 	   : (sizeof (Var) == 2						      \
f995fa8
-	      ? bswap_16 (Var)						      \
f995fa8
+	      ? (unsigned short int) bswap_16 (Var)			      \
f995fa8
 	      : (sizeof (Var) == 4					      \
f995fa8
 		 ? bswap_32 (Var)					      \
f995fa8
 		 : bswap_64 (Var))))
Mark J. Wielaard 22346cb
--- elfutils/libelf/gnuhash_xlate.h
Mark J. Wielaard 22346cb
+++ elfutils/libelf/gnuhash_xlate.h
Mark J. Wielaard 22346cb
@@ -1,5 +1,5 @@
Mark J. Wielaard 22346cb
 /* Conversion functions for versioning information.
Mark J. Wielaard 22346cb
-   Copyright (C) 2006, 2007 Red Hat, Inc.
Mark J. Wielaard 22346cb
+   Copyright (C) 2006-2011 Red Hat, Inc.
Mark Wielaard d10bca5
    This file is part of elfutils.
Mark J. Wielaard 22346cb
    Written by Ulrich Drepper <drepper@redhat.com>, 2006.
Mark J. Wielaard 22346cb
 
Mark Wielaard d10bca5
@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void
Mark J. Wielaard 22346cb
   dest32 = (Elf32_Word *) &dest64[bitmask_words];
Mark J. Wielaard 22346cb
   while (len >= 4)
Mark J. Wielaard 22346cb
     {
Mark J. Wielaard 22346cb
-      *dest32++ = bswap_32 (*src32++);
Mark J. Wielaard 22346cb
+      *dest32 = bswap_32 (*src32);
Mark J. Wielaard 22346cb
+      ++dest32;
Mark J. Wielaard 22346cb
+      ++src32;
Mark J. Wielaard 22346cb
       len -= 4;
Mark J. Wielaard 22346cb
     }
Mark J. Wielaard 22346cb
 }
570047f
--- elfutils/libelf/Makefile.in
570047f
+++ elfutils/libelf/Makefile.in
Mark J. Wielaard 22346cb
@@ -39,11 +39,12 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
Mark J. Wielaard 22346cb
 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
-@BUILD_STATIC_TRUE@am__append_2 = -fpic
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_STATIC_TRUE@am__append_3 = -fpic
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
Mark J. Wielaard 22346cb
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
Mark J. Wielaard 22346cb
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread
Mark J. Wielaard 22346cb
 subdir = libelf
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark J. Wielaard 22346cb
@@ -189,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -218,6 +220,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = 1
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -278,10 +281,9 @@ top_srcdir = @top_srcdir@
Mark J. Wielaard 22346cb
 zip_LIBS = @zip_LIBS@
ba5f203
 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1) $(am__append_2)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2) $(am__append_3)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
Mark J. Wielaard 22346cb
@@ -346,7 +348,7 @@ libelf_a_SOURCES = elf_version.c elf_has
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libelf_pic_a_SOURCES = 
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
Mark J. Wielaard 22346cb
-@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3)
Mark J. Wielaard 22346cb
+@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_4)
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@libelf_so_SOURCES = 
Mark J. Wielaard 22346cb
 noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
Mark J. Wielaard 22346cb
 		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
570047f
--- elfutils/m4/Makefile.in
570047f
+++ elfutils/m4/Makefile.in
d36848b
@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
0f58b0c
@@ -104,6 +105,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
f995fa8
 USE_NLS = @USE_NLS@
f995fa8
 VERSION = @VERSION@
f995fa8
+WEXTRA = @WEXTRA@
f995fa8
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
f995fa8
--- elfutils/Makefile.in
f995fa8
+++ elfutils/Makefile.in
d36848b
@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
0f58b0c
@@ -184,6 +185,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
5c16b08
--- elfutils/src/addr2line.c
5c16b08
+++ elfutils/src/addr2line.c
Mark Wielaard d10bca5
@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
5c16b08
       bool parsed = false;
0f58b0c
       int i, j;
5c16b08
       char *name = NULL;
0f58b0c
-      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
0f58b0c
+      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
0f58b0c
 	  && string[i] == '\0')
fbfe249
 	parsed = adjust_to_section (name, &addr, dwfl);
0f58b0c
-      switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
0f58b0c
+      switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
5c16b08
 	{
0f58b0c
 	default:
0f58b0c
 	  break;
f995fa8
--- elfutils/src/ChangeLog
f995fa8
+++ elfutils/src/ChangeLog
Mark Wielaard d10bca5
@@ -519,8 +519,16 @@
e4d1f5c
 	* readelf.c (attr_callback): Use print_block only when we don't use
e4d1f5c
 	print_ops.
e4d1f5c
 
e4d1f5c
+2009-08-17  Roland McGrath  <roland@redhat.com>
e4d1f5c
+
e4d1f5c
+	* ld.h: Disable extern inlines for GCC 4.2.
e4d1f5c
+
e4d1f5c
 2009-08-14  Roland McGrath  <roland@redhat.com>
e4d1f5c
 
e4d1f5c
+	* strings.c (read_block): Conditionalize posix_fadvise use
e4d1f5c
+	on [POSIX_FADV_SEQUENTIAL].
e4d1f5c
+	From Petr Salinger <Petr.Salinger@seznam.cz>.
e4d1f5c
+
e4d1f5c
 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
e4d1f5c
 
e4d1f5c
 2009-08-01  Ulrich Drepper  <drepper@redhat.com>
Mark Wielaard d10bca5
@@ -684,6 +692,8 @@
5c16b08
 	* readelf.c (print_debug_frame_section): Use t instead of j formats
5c16b08
 	for ptrdiff_t OFFSET.
5c16b08
 
5c16b08
+	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
5c16b08
+
5c16b08
 2009-01-21  Ulrich Drepper  <drepper@redhat.com>
5c16b08
 
5c16b08
 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
Mark Wielaard d10bca5
@@ -867,6 +877,11 @@
fa1a8eb
 	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
fa1a8eb
 	is valid in RELRO.
fa1a8eb
 
fb2677a
+2008-03-01  Roland McGrath  <roland@redhat.com>
fb2677a
+
fb2677a
+	* readelf.c (dump_archive_index): Tweak portability hack
fb2677a
+	to match [__GNUC__ < 4] too.
fb2677a
+
fb2677a
 2008-02-29  Roland McGrath  <roland@redhat.com>
fb2677a
 
fb2677a
 	* readelf.c (print_attributes): Add a cast.
Mark Wielaard d10bca5
@@ -1118,6 +1133,8 @@
a7b828d
 
a7b828d
 	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
a7b828d
 
2dfc22c
+	* Makefile.am (readelf_no_Werror): New variable.
2dfc22c
+
2dfc22c
 2007-10-15  Roland McGrath  <roland@redhat.com>
2dfc22c
 
2dfc22c
 	* make-debug-archive.in: New file.
Mark Wielaard d10bca5
@@ -1557,6 +1574,10 @@
9a3c170
 	* elflint.c (valid_e_machine): Add EM_ALPHA.
9a3c170
 	Reported by Christian Aichinger <Greek0@gmx.net>.
9a3c170
 
9a3c170
+	* strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
9a3c170
+	MADV_SEQUENTIAL if undefined.  	Don't call posix_madvise
9a3c170
+	if neither is defined.
9a3c170
+
9a3c170
 2006-08-08  Ulrich Drepper  <drepper@redhat.com>
9a3c170
 
9a3c170
 	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
Mark Wielaard d10bca5
@@ -1633,6 +1654,10 @@
a997709
 	* Makefile.am: Add hacks to create dependency files for non-generic
a997709
 	linker.
a997709
 
3c3d383
+2006-04-05  Roland McGrath  <roland@redhat.com>
3c3d383
+
3c3d383
+	* strings.c (MAP_POPULATE): Define to 0 if undefined.
3c3d383
+
3c3d383
 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
3c3d383
 
3c3d383
 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
Mark Wielaard d10bca5
@@ -1981,6 +2006,11 @@
f995fa8
 	* readelf.c (print_debug_loc_section): Fix indentation for larger
f995fa8
 	address size.
f995fa8
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
 2005-05-30  Roland McGrath  <roland@redhat.com>
f995fa8
 
f995fa8
 	* readelf.c (print_debug_line_section): Print section offset of each
f995fa8
--- elfutils/src/findtextrel.c
f995fa8
+++ elfutils/src/findtextrel.c
Mark Wielaard d10bca5
@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
f995fa8
 
f995fa8
 
f995fa8
 static void
f995fa8
-check_rel (size_t nsegments, struct segments segments[nsegments],
f995fa8
+check_rel (size_t nsegments, struct segments segments[
f995fa8
+#if __GNUC__ >= 4
f995fa8
+						      nsegments
f995fa8
+#endif
f995fa8
+	   ],
f995fa8
 	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
f995fa8
 	   const char *fname, bool more_than_one, void **knownsrcs)
f995fa8
 {
e4d1f5c
--- elfutils/src/ld.h
e4d1f5c
+++ elfutils/src/ld.h
Mark Wielaard d10bca5
@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
e4d1f5c
 
e4d1f5c
 /* Checked whether the symbol is undefined and referenced from a DSO.  */
e4d1f5c
 extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
e4d1f5c
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
e4d1f5c
 #ifdef __GNUC_STDC_INLINE__
e4d1f5c
 __attribute__ ((__gnu_inline__))
e4d1f5c
 #endif
Mark Wielaard d10bca5
@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin
e4d1f5c
 
e4d1f5c
   return sym->defined && sym->in_dso;
e4d1f5c
 }
e4d1f5c
+#endif	/* Optimizing and not GCC 4.2.  */
e4d1f5c
 
e4d1f5c
 #endif	/* ld.h */
570047f
--- elfutils/src/Makefile.am
570047f
+++ elfutils/src/Makefile.am
Mark Wielaard d10bca5
@@ -95,6 +95,9 @@ addr2line_no_Wformat = yes
2dfc22c
 # XXX While the file is not finished, don't warn about this
2dfc22c
 ldgeneric_no_Wunused = yes
2dfc22c
 
2dfc22c
+# Buggy old compilers.
2dfc22c
+readelf_no_Werror = yes
2dfc22c
+
2dfc22c
 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
Mark J. Wielaard 22346cb
 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
Mark J. Wielaard 22346cb
 	   $(demanglelib)
570047f
--- elfutils/src/Makefile.in
570047f
+++ elfutils/src/Makefile.in
Mark J. Wielaard 22346cb
@@ -40,7 +40,8 @@ host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
Mark J. Wielaard 22346cb
 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
Mark Wielaard d10bca5
 	ldlex.c ldscript.c
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
 bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
Mark J. Wielaard 22346cb
 	strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
Mark J. Wielaard 22346cb
 	findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
Mark J. Wielaard 22346cb
@@ -49,9 +50,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
Mark J. Wielaard 22346cb
 @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
Mark J. Wielaard 22346cb
 # We never build this library but we need to get the dependency files
Mark J. Wielaard 22346cb
 # of all the linker backends that might be used in a non-generic linker.
Mark J. Wielaard 22346cb
-@NEVER_TRUE@am__append_2 = libdummy.a
Mark J. Wielaard 22346cb
+@NEVER_TRUE@am__append_3 = libdummy.a
Mark J. Wielaard 22346cb
 # -ldl is always needed for libebl.
Mark J. Wielaard 22346cb
-@NATIVE_LD_TRUE@am__append_3 = libld_elf.a
Mark J. Wielaard 22346cb
+@NATIVE_LD_TRUE@am__append_4 = libld_elf.a
Mark J. Wielaard 22346cb
 @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
Mark J. Wielaard 22346cb
 subdir = src
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
@@ -115,7 +116,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
Mark J. Wielaard 22346cb
 	versionhash.$(OBJEXT)
Mark J. Wielaard 22346cb
 ld_OBJECTS = $(am_ld_OBJECTS)
Mark J. Wielaard 22346cb
 ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \
Mark J. Wielaard 22346cb
-	$(am__append_3)
Mark J. Wielaard 22346cb
+	$(am__append_4)
Mark J. Wielaard 22346cb
 ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
Mark J. Wielaard 22346cb
 	$@
Mark J. Wielaard 22346cb
 am_libld_elf_i386_so_OBJECTS =
Mark J. Wielaard 22346cb
@@ -229,6 +230,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark J. Wielaard 22346cb
@@ -258,6 +260,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark J. Wielaard 22346cb
@@ -321,10 +324,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
Mark J. Wielaard 22346cb
 	-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
ba5f203
 	-I$(srcdir)/../libasm
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
Mark J. Wielaard 22346cb
@@ -340,8 +342,8 @@ AM_LFLAGS = -Pld -olex.yy.c
Mark J. Wielaard 22346cb
 native_ld = @native_ld@
Mark J. Wielaard 22346cb
 ld_dsos = libld_elf_i386_pic.a
Mark J. Wielaard 22346cb
 @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
Mark J. Wielaard 22346cb
-@NATIVE_LD_FALSE@	$(am__append_2)
Mark J. Wielaard 22346cb
-@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)
Mark J. Wielaard 22346cb
+@NATIVE_LD_FALSE@	$(am__append_3)
Mark J. Wielaard 22346cb
+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3)
Mark J. Wielaard 22346cb
 @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
Mark J. Wielaard 22346cb
 @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
Mark J. Wielaard 22346cb
 ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
Mark J. Wielaard 22346cb
@@ -370,6 +372,9 @@ strings_no_Wformat = yes
5c16b08
 addr2line_no_Wformat = yes
2dfc22c
 # XXX While the file is not finished, don't warn about this
2dfc22c
 ldgeneric_no_Wunused = yes
2dfc22c
+
2dfc22c
+# Buggy old compilers.
2dfc22c
+readelf_no_Werror = yes
2dfc22c
 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
Mark J. Wielaard 22346cb
 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
Mark J. Wielaard 22346cb
 	   $(demanglelib)
Mark J. Wielaard 22346cb
@@ -377,7 +382,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
2dfc22c
 size_LDADD = $(libelf) $(libeu) $(libmudflap)
Mark J. Wielaard 22346cb
 strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
Mark J. Wielaard 22346cb
 ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
Mark J. Wielaard 22346cb
-	$(am__append_3)
Mark J. Wielaard 22346cb
+	$(am__append_4)
Mark J. Wielaard 22346cb
 ld_LDFLAGS = -rdynamic
Mark J. Wielaard 22346cb
 elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
Mark J. Wielaard 22346cb
 findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
fb2677a
--- elfutils/src/readelf.c
fb2677a
+++ elfutils/src/readelf.c
Mark Wielaard d10bca5
@@ -4429,10 +4429,11 @@ struct listptr
Roland McGrath 1548e59
 #define listptr_offset_size(p)	((p)->dwarf64 ? 8 : 4)
Roland McGrath 1548e59
 #define listptr_address_size(p)	((p)->addr64 ? 8 : 4)
Roland McGrath 1548e59
 
Roland McGrath 1548e59
+static const char *listptr_name;
Roland McGrath 1548e59
 static int
Roland McGrath 1548e59
-compare_listptr (const void *a, const void *b, void *arg)
Roland McGrath 1548e59
+compare_listptr (const void *a, const void *b)
Roland McGrath 1548e59
 {
Roland McGrath 1548e59
-  const char *name = arg;
Roland McGrath 1548e59
+  const char *const name = listptr_name;
Roland McGrath 1548e59
   struct listptr *p1 = (void *) a;
Roland McGrath 1548e59
   struct listptr *p2 = (void *) b;
Roland McGrath 1548e59
 
Mark Wielaard d10bca5
@@ -4513,8 +4514,11 @@ static void
Roland McGrath 1548e59
 sort_listptr (struct listptr_table *table, const char *name)
Roland McGrath 1548e59
 {
Roland McGrath 1548e59
   if (table->n > 0)
Roland McGrath 1548e59
-    qsort_r (table->table, table->n, sizeof table->table[0],
Roland McGrath 1548e59
-	     &compare_listptr, (void *) name);
Roland McGrath 1548e59
+    {
Roland McGrath 1548e59
+      listptr_name = name;
Roland McGrath 1548e59
+      qsort (table->table, table->n, sizeof table->table[0],
Roland McGrath 1548e59
+	     &compare_listptr);
Roland McGrath 1548e59
+    }
Roland McGrath 1548e59
 }
Roland McGrath 1548e59
 
Roland McGrath 1548e59
 static bool
Mark J. Wielaard 22346cb
@@ -8478,7 +8482,7 @@ dump_archive_index (Elf *elf, const char
fb2677a
 	  if (unlikely (elf_rand (elf, as_off) == 0)
fb2677a
 	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
fb2677a
 			   == NULL))
fb2677a
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
fb2677a
+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4
fb2677a
 	    while (1)
fb2677a
 #endif
fb2677a
 	      error (EXIT_FAILURE, 0,
3c3d383
--- elfutils/src/strings.c
3c3d383
+++ elfutils/src/strings.c
Mark Wielaard d10bca5
@@ -43,6 +43,10 @@
3c3d383
 
3c3d383
 #include <system.h>
3c3d383
 
3c3d383
+#ifndef MAP_POPULATE
3c3d383
+# define MAP_POPULATE 0
3c3d383
+#endif
3c3d383
+
3c3d383
 
3c3d383
 /* Prototypes of local functions.  */
3c3d383
 static int read_fd (int fd, const char *fname, off64_t fdlen);
Mark Wielaard d10bca5
@@ -483,8 +487,13 @@ map_file (int fd, off64_t start_off, off
9a3c170
 		    fd, start_off);
9a3c170
       if (mem != MAP_FAILED)
9a3c170
 	{
9a3c170
+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
9a3c170
+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
9a3c170
+#endif
9a3c170
+#ifdef POSIX_MADV_SEQUENTIAL
9a3c170
 	  /* We will go through the mapping sequentially.  */
9a3c170
 	  (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
9a3c170
+#endif
9a3c170
 	  break;
9a3c170
 	}
9a3c170
       if (errno != EINVAL && errno != ENOMEM)
Mark Wielaard d10bca5
@@ -576,9 +585,11 @@ read_block (int fd, const char *fname, o
e4d1f5c
       elfmap_off = from & ~(ps - 1);
e4d1f5c
       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
e4d1f5c
 
e4d1f5c
+#ifdef POSIX_FADV_SEQUENTIAL
e4d1f5c
       if (unlikely (elfmap == MAP_FAILED))
e4d1f5c
 	/* Let the kernel know we are going to read everything in sequence.  */
e4d1f5c
 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
e4d1f5c
+#endif
e4d1f5c
     }
e4d1f5c
 
e4d1f5c
   if (unlikely (elfmap == MAP_FAILED))
570047f
--- elfutils/src/strip.c
570047f
+++ elfutils/src/strip.c
Mark Wielaard d10bca5
@@ -45,6 +45,12 @@
b73b6ec
 #include <libebl.h>
b73b6ec
 #include <system.h>
b73b6ec
 
b73b6ec
+#ifdef HAVE_FUTIMES
b73b6ec
+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
b73b6ec
+#else
b73b6ec
+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
b73b6ec
+#endif
b73b6ec
+
Mark J. Wielaard 22346cb
 typedef uint8_t GElf_Byte;
b73b6ec
 
b73b6ec
 /* Name and version of program.  */
Mark Wielaard d10bca5
@@ -318,8 +324,18 @@ process_file (const char *fname)
a769ac6
 
a769ac6
       /* If we have to preserve the timestamp, we need it in the
a769ac6
 	 format utimes() understands.  */
a769ac6
+#ifdef HAVE_STRUCT_STAT_ST_ATIM
a769ac6
       TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
a769ac6
+#else
a769ac6
+      tv[0].tv_sec = pre_st.st_atime;
a769ac6
+      tv[0].tv_usec = 0;
a769ac6
+#endif
a769ac6
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
a769ac6
       TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
a769ac6
+#else
a769ac6
+      tv[1].tv_sec = pre_st.st_atime;
a769ac6
+      tv[1].tv_usec = 0;
a769ac6
+#endif
a769ac6
     }
a769ac6
 
a769ac6
   /* Open the file.  */
Mark Wielaard d10bca5
@@ -2055,7 +2071,7 @@ while computing checksum for debug infor
a769ac6
   /* If requested, preserve the timestamp.  */
a769ac6
   if (tvp != NULL)
a769ac6
     {
a769ac6
-      if (futimes (fd, tvp) != 0)
b73b6ec
+      if (FUTIMES (fd, output_fname, tvp) != 0)
a769ac6
 	{
a769ac6
 	  error (0, errno, gettext ("\
5fa3867
 cannot set access and modification date of '%s'"),
Mark Wielaard d10bca5
@@ -2112,7 +2128,7 @@ handle_ar (int fd, Elf *elf, const char
a769ac6
 
a769ac6
   if (tvp != NULL)
a769ac6
     {
a769ac6
-      if (unlikely (futimes (fd, tvp) != 0))
b73b6ec
+      if (unlikely (FUTIMES (fd, fname, tvp) != 0))
a769ac6
 	{
a769ac6
 	  error (0, errno, gettext ("\
5fa3867
 cannot set access and modification date of '%s'"), fname);
f995fa8
--- elfutils/tests/ChangeLog
f995fa8
+++ elfutils/tests/ChangeLog
Mark Wielaard d10bca5
@@ -333,6 +333,8 @@
fb2677a
 
fb2677a
 2008-01-21  Roland McGrath  <roland@redhat.com>
fb2677a
 
fb2677a
+	* line2addr.c (main): Revert last change.
fb2677a
+
fb2677a
 	* testfile45.S.bz2: Add tests for cltq, cqto.
fb2677a
 	* testfile45.expect.bz2: Adjust.
fb2677a
 
Mark Wielaard d10bca5
@@ -1041,6 +1043,11 @@
f995fa8
 	* Makefile.am (TESTS): Add run-elflint-test.sh.
f995fa8
 	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
f995fa8
 
f995fa8
+2005-05-31  Roland McGrath  <roland@redhat.com>
f995fa8
+
f995fa8
+	* Makefile.am (WEXTRA): New variable, substituted by configure.
f995fa8
+	(AM_CFLAGS): Use it in place of -Wextra.
f995fa8
+
f995fa8
 2005-05-24  Ulrich Drepper  <drepper@redhat.com>
f995fa8
 
f995fa8
 	* get-files.c (main): Use correct format specifier.
fb2677a
--- elfutils/tests/line2addr.c
fb2677a
+++ elfutils/tests/line2addr.c
Mark Wielaard d10bca5
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
fb2677a
     {
fb2677a
       struct args a = { .arg = argv[cnt] };
fb2677a
 
fb2677a
-      switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
fb2677a
+      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
fb2677a
 	{
fb2677a
 	default:
fb2677a
 	case 0:
570047f
--- elfutils/tests/Makefile.in
570047f
+++ elfutils/tests/Makefile.in
Mark J. Wielaard 22346cb
@@ -36,14 +36,15 @@ build_triplet = @build@
Mark J. Wielaard 22346cb
 host_triplet = @host@
Mark J. Wielaard 22346cb
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
Mark J. Wielaard 22346cb
 	$(top_srcdir)/config/eu.am ChangeLog
Mark J. Wielaard 22346cb
-@MUDFLAP_TRUE@am__append_1 = -fmudflap
Mark J. Wielaard 22346cb
-@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
Mark J. Wielaard 22346cb
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
Mark J. Wielaard 22346cb
+@MUDFLAP_TRUE@am__append_2 = -fmudflap
Mark J. Wielaard 22346cb
+@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
Mark J. Wielaard 22346cb
 @STANDALONE_FALSE@	    -I$(top_srcdir)/libdwfl \
Mark J. Wielaard 22346cb
 @STANDALONE_FALSE@	    -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
Mark J. Wielaard 22346cb
 @STANDALONE_FALSE@	    -I$(top_srcdir)/lib -I..
Mark J. Wielaard 22346cb
 
Mark J. Wielaard 22346cb
-@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf
Mark J. Wielaard 22346cb
-@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)
Mark J. Wielaard 22346cb
+@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf
Mark J. Wielaard 22346cb
+@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH)
Mark J. Wielaard 22346cb
 noinst_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
Mark J. Wielaard 22346cb
 	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
Mark J. Wielaard 22346cb
 	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
Mark Wielaard d10bca5
@@ -89,10 +90,10 @@ TESTS = run-arextract.sh run-arsymtest.s
Mark Wielaard d10bca5
 	run-rerequest_tag.sh run-typeiter.sh run-readelf-d.sh \
Mark Wielaard d10bca5
 	run-unstrip-n.sh run-low_high_pc.sh $(am__EXEEXT_1) \
Mark Wielaard d10bca5
 	$(am__EXEEXT_3)
Mark J. Wielaard 22346cb
-@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
Mark J. Wielaard 22346cb
 @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
Mark J. Wielaard 22346cb
-@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS)
Mark J. Wielaard 22346cb
+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
Mark J. Wielaard 22346cb
 @HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)
Mark J. Wielaard 22346cb
+@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
Mark J. Wielaard 22346cb
 subdir = tests
Mark J. Wielaard 22346cb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Mark J. Wielaard 22346cb
 am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
Mark Wielaard d10bca5
@@ -403,6 +404,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
80ba80a
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
80ba80a
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
80ba80a
 LDFLAGS = @LDFLAGS@
80ba80a
+LD_AS_NEEDED = @LD_AS_NEEDED@
80ba80a
 LEX = @LEX@
80ba80a
 LEXLIB = @LEXLIB@
80ba80a
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
Mark Wielaard d10bca5
@@ -432,6 +434,7 @@ SHELL = @SHELL@
3cb5dfb
 STRIP = @STRIP@
b73b6ec
 USE_NLS = @USE_NLS@
b73b6ec
 VERSION = @VERSION@
b73b6ec
+WEXTRA = @WEXTRA@
b73b6ec
 XGETTEXT = @XGETTEXT@
3cb5dfb
 XGETTEXT_015 = @XGETTEXT_015@
f790d25
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
Mark Wielaard d10bca5
@@ -490,12 +493,11 @@ top_build_prefix = @top_build_prefix@
Mark J. Wielaard 22346cb
 top_builddir = @top_builddir@
Mark J. Wielaard 22346cb
 top_srcdir = @top_srcdir@
Mark J. Wielaard 22346cb
 zip_LIBS = @zip_LIBS@
Mark J. Wielaard 22346cb
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
Mark J. Wielaard 22346cb
+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)
ba5f203
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
Mark J. Wielaard 22346cb
-	$($(*F)_no_Werror),,-Werror) $(if \
ba5f203
-	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
ba5f203
+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
ba5f203
 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
Mark J. Wielaard 22346cb
-	$(am__append_1)
Mark J. Wielaard 22346cb
+	$(am__append_1) $(am__append_2)
ba5f203
 @MUDFLAP_FALSE@libmudflap = 
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@libmudflap = -lmudflap
Mark J. Wielaard 22346cb
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
Mark Wielaard d10bca5
@@ -505,7 +507,7 @@ CLEANFILES = *.gcno *.gcda
Mark J. Wielaard 22346cb
 textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
Mark J. Wielaard 22346cb
 @MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
Mark J. Wielaard 22346cb
 @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
Mark J. Wielaard 22346cb
-AM_LDFLAGS = $(am__append_3) $(am__append_4)
Mark J. Wielaard 22346cb
+AM_LDFLAGS = $(am__append_4) $(am__append_5)
Mark J. Wielaard 22346cb
 @TESTS_RPATH_FALSE@tests_rpath = no
Mark J. Wielaard 22346cb
 @TESTS_RPATH_TRUE@tests_rpath = yes
Mark J. Wielaard 22346cb
 asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \