summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoxana Ciobanu <roxana.ciobanu@intel.com>2014-07-01 17:17:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-03 17:41:17 +0100
commit52a6d20519870103134166d91e22d21fd736195d (patch)
tree01eb0202f9758b5ec95bd3deb794dbe28abcbc56 /meta
parent2c59db63189352914a1bf2d02263f33cc9f81b4b (diff)
downloadpoky-52a6d20519870103134166d91e22d21fd736195d.tar.gz
elfutils/elfutils-native: Fix patching generated files
Patch redhat-portability.diff was patching generated files. This patch removes every hunk related to Makefile.in and configure files. [YOCTO #6491] (From OE-Core rev: 60efcf67ba2b556bcd5ffea0056884189d5bed52) Signed-off-by: Roxana Ciobanu <roxana.ciobanu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff859
-rw-r--r--meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff370
2 files changed, 1 insertions, 1228 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff
index a34ba29eac..5a75375690 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff
@@ -44,56 +44,6 @@
44 $(textrel_check) 44 $(textrel_check)
45 45
46 libebl_i386.so: $(cpu_i386) 46 libebl_i386.so: $(cpu_i386)
47--- elfutils/backends/Makefile.in
48+++ elfutils/backends/Makefile.in
49@@ -83,7 +83,8 @@ host_triplet = @host@
50 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
51 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
52 $(noinst_HEADERS) ChangeLog
53-@MUDFLAP_TRUE@am__append_1 = -fmudflap
54+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
55+@MUDFLAP_TRUE@am__append_2 = -fmudflap
56 subdir = backends
57 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
58 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
59@@ -284,6 +285,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
60 INSTALL_SCRIPT = @INSTALL_SCRIPT@
61 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
62 LDFLAGS = @LDFLAGS@
63+LD_AS_NEEDED = @LD_AS_NEEDED@
64 LEX = @LEX@
65 LEXLIB = @LEXLIB@
66 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
67@@ -315,6 +317,7 @@ SHELL = @SHELL@
68 STRIP = @STRIP@
69 USE_NLS = @USE_NLS@
70 VERSION = @VERSION@
71+WEXTRA = @WEXTRA@
72 XGETTEXT = @XGETTEXT@
73 XGETTEXT_015 = @XGETTEXT_015@
74 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
75@@ -378,10 +381,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
76 -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
77 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
78 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
79- $($(*F)_no_Werror),,-Werror) $(if \
80- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
81+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
82 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
83- $(am__append_1)
84+ $(am__append_1) $(am__append_2)
85 @MUDFLAP_FALSE@libmudflap =
86 @MUDFLAP_TRUE@libmudflap = -lmudflap
87 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
88@@ -888,7 +890,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
89 $(LINK) -shared -o $(@:.map=.so) \
90 -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
91 -Wl,--version-script,$(@:.so=.map) \
92- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
93+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
94 $(textrel_check)
95
96 libebl_i386.so: $(cpu_i386)
97--- elfutils/ChangeLog 47--- elfutils/ChangeLog
98+++ elfutils/ChangeLog 48+++ elfutils/ChangeLog
99@@ -118,6 +118,8 @@ 49@@ -118,6 +118,8 @@
@@ -221,24 +171,6 @@
221 if MUDFLAP 171 if MUDFLAP
222 AM_CFLAGS += -fmudflap 172 AM_CFLAGS += -fmudflap
223 libmudflap = -lmudflap 173 libmudflap = -lmudflap
224--- elfutils/config/Makefile.in
225+++ elfutils/config/Makefile.in
226@@ -146,6 +146,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
227 INSTALL_SCRIPT = @INSTALL_SCRIPT@
228 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
229 LDFLAGS = @LDFLAGS@
230+LD_AS_NEEDED = @LD_AS_NEEDED@
231 LEX = @LEX@
232 LEXLIB = @LEXLIB@
233 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
234@@ -177,6 +178,7 @@ SHELL = @SHELL@
235 STRIP = @STRIP@
236 USE_NLS = @USE_NLS@
237 VERSION = @VERSION@
238+WEXTRA = @WEXTRA@
239 XGETTEXT = @XGETTEXT@
240 XGETTEXT_015 = @XGETTEXT_015@
241 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
242--- elfutils/config.h.in 174--- elfutils/config.h.in
243+++ elfutils/config.h.in 175+++ elfutils/config.h.in
244@@ -6,6 +6,9 @@ 176@@ -6,6 +6,9 @@
@@ -259,231 +191,6 @@
259+#undef __thread 191+#undef __thread
260+ 192+
261 #include <eu-config.h> 193 #include <eu-config.h>
262--- elfutils/configure
263+++ elfutils/configure
264@@ -661,6 +661,8 @@ ZLIB_TRUE
265 LIBEBL_SUBDIR
266 TESTS_RPATH_FALSE
267 TESTS_RPATH_TRUE
268+BUILD_WERROR_FALSE
269+BUILD_WERROR_TRUE
270 BUILD_STATIC_FALSE
271 BUILD_STATIC_TRUE
272 USE_VALGRIND_FALSE
273@@ -678,6 +680,8 @@ NEVER_TRUE
274 base_cpu
275 NATIVE_LD_FALSE
276 NATIVE_LD_TRUE
277+LD_AS_NEEDED
278+WEXTRA
279 NM
280 READELF
281 ac_ct_AR
282@@ -802,6 +806,7 @@ enable_debugpred
283 enable_gprof
284 enable_gcov
285 enable_valgrind
286+enable_werror
287 enable_tests_rpath
288 enable_libebl_subdir
289 with_zlib
290@@ -1461,6 +1466,7 @@ Optional Features:
291 --enable-gprof build binaries with gprof support
292 --enable-gcov build binaries with gcov support
293 --enable-valgrind run all tests under valgrind
294+ --disable-werror do not build with -Werror
295 --enable-tests-rpath build $ORIGIN-using rpath into tests
296 --enable-libebl-subdir=DIR
297 install libebl_CPU modules in $(libdir)/DIR
298@@ -4709,6 +4715,130 @@ if test "x$ac_cv_c99" != xyes; then :
299 as_fn_error $? "gcc with C99 support required" "$LINENO" 5
300 fi
301
302+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
303+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
304+if ${ac_cv_cc_wextra+:} false; then :
305+ $as_echo_n "(cached) " >&6
306+else
307+ old_CFLAGS="$CFLAGS"
308+CFLAGS="$CFLAGS -Wextra"
309+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
310+/* end confdefs.h. */
311+void foo (void) { }
312+_ACEOF
313+if ac_fn_c_try_compile "$LINENO"; then :
314+ ac_cv_cc_wextra=yes
315+else
316+ ac_cv_cc_wextra=no
317+fi
318+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
319+CFLAGS="$old_CFLAGS"
320+fi
321+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
322+$as_echo "$ac_cv_cc_wextra" >&6; }
323+
324+if test "x$ac_cv_cc_wextra" = xyes; then :
325+ WEXTRA=-Wextra
326+else
327+ WEXTRA=-W
328+fi
329+
330+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
331+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
332+if ${ac_cv_cc_gnu89_inline+:} false; then :
333+ $as_echo_n "(cached) " >&6
334+else
335+ old_CFLAGS="$CFLAGS"
336+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
337+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
338+/* end confdefs.h. */
339+
340+void foo (void)
341+{
342+ inline void bar (void) {}
343+ bar ();
344+}
345+extern inline void baz (void) {}
346+
347+_ACEOF
348+if ac_fn_c_try_compile "$LINENO"; then :
349+ ac_cv_cc_gnu89_inline=yes
350+else
351+ ac_cv_cc_gnu89_inline=no
352+fi
353+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
354+CFLAGS="$old_CFLAGS"
355+fi
356+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
357+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
358+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
359+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
360+fi
361+
362+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
363+$as_echo_n "checking for --as-needed linker option... " >&6; }
364+if ${ac_cv_as_needed+:} false; then :
365+ $as_echo_n "(cached) " >&6
366+else
367+ cat > conftest.c <<EOF
368+int main (void) { return 0; }
369+EOF
370+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
371+ -fPIC -shared -o conftest.so conftest.c
372+ -Wl,--as-needed 1>&5'
373+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
374+ (eval $ac_try) 2>&5
375+ ac_status=$?
376+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
377+ test $ac_status = 0; }; }
378+then
379+ ac_cv_as_needed=yes
380+else
381+ ac_cv_as_needed=no
382+fi
383+rm -f conftest*
384+fi
385+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
386+$as_echo "$ac_cv_as_needed" >&6; }
387+if test "x$ac_cv_as_needed" = xyes; then :
388+ LD_AS_NEEDED=-Wl,--as-needed
389+else
390+ LD_AS_NEEDED=
391+fi
392+
393+
394+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
395+$as_echo_n "checking for __builtin_popcount... " >&6; }
396+if ${ac_cv_popcount+:} false; then :
397+ $as_echo_n "(cached) " >&6
398+else
399+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
400+/* end confdefs.h. */
401+
402+int
403+main ()
404+{
405+exit (__builtin_popcount (127));
406+ ;
407+ return 0;
408+}
409+_ACEOF
410+if ac_fn_c_try_link "$LINENO"; then :
411+ ac_cv_popcount=yes
412+else
413+ ac_cv_popcount=no
414+fi
415+rm -f core conftest.err conftest.$ac_objext \
416+ conftest$ac_exeext conftest.$ac_ext
417+fi
418+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
419+$as_echo "$ac_cv_popcount" >&6; }
420+if test "x$ac_cv_popcount" = xyes; then :
421+
422+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
423+
424+fi
425+
426 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
427 $as_echo_n "checking for __thread support... " >&6; }
428 if ${ac_cv_tls+:} false; then :
429@@ -4745,7 +4875,13 @@ fi
430 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
431 $as_echo "$ac_cv_tls" >&6; }
432 if test "x$ac_cv_tls" != xyes; then :
433- as_fn_error $? "__thread support required" "$LINENO" 5
434+ if test "$use_locks" = yes; then :
435+ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
436+else
437+
438+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
439+
440+fi
441 fi
442
443 # Check whether --enable-largefile was given.
444@@ -5155,6 +5291,22 @@ else
445 fi
446
447
448+# Check whether --enable-werror was given.
449+if test "${enable_werror+set}" = set; then :
450+ enableval=$enable_werror; enable_werror=$enableval
451+else
452+ enable_werror=yes
453+fi
454+
455+ if test "$enable_werror" = yes; then
456+ BUILD_WERROR_TRUE=
457+ BUILD_WERROR_FALSE='#'
458+else
459+ BUILD_WERROR_TRUE='#'
460+ BUILD_WERROR_FALSE=
461+fi
462+
463+
464 # Check whether --enable-tests-rpath was given.
465 if test "${enable_tests_rpath+set}" = set; then :
466 enableval=$enable_tests_rpath; tests_use_rpath=$enableval
467@@ -5875,7 +6027,7 @@ case "$eu_version" in
468 esac
469
470 # Round up to the next release API (x.y) version.
471-eu_version=$(( (eu_version + 999) / 1000 ))
472+eu_version=`expr \( $eu_version + 999 \) / 1000`
473
474 ac_ext=c
475 ac_cpp='$CPP $CPPFLAGS'
476@@ -6613,6 +6765,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
477 as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
478 Usually this means the macro was only invoked conditionally." "$LINENO" 5
479 fi
480+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
481+ as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
482+Usually this means the macro was only invoked conditionally." "$LINENO" 5
483+fi
484 if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
485 as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
486 Usually this means the macro was only invoked conditionally." "$LINENO" 5
487--- elfutils/configure.ac 194--- elfutils/configure.ac
488+++ elfutils/configure.ac 195+++ elfutils/configure.ac
489@@ -99,6 +99,54 @@ CFLAGS="$old_CFLAGS"]) 196@@ -99,6 +99,54 @@ CFLAGS="$old_CFLAGS"])
@@ -618,47 +325,6 @@
618 325
619 #ifdef SHARED 326 #ifdef SHARED
620 # define OLD_VERSION(name, version) \ 327 # define OLD_VERSION(name, version) \
621--- elfutils/lib/Makefile.in
622+++ elfutils/lib/Makefile.in
623@@ -82,7 +82,8 @@ host_triplet = @host@
624 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
625 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
626 $(noinst_HEADERS) ChangeLog
627-@MUDFLAP_TRUE@am__append_1 = -fmudflap
628+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
629+@MUDFLAP_TRUE@am__append_2 = -fmudflap
630 subdir = lib
631 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
632 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
633@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
634 INSTALL_SCRIPT = @INSTALL_SCRIPT@
635 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
636 LDFLAGS = @LDFLAGS@
637+LD_AS_NEEDED = @LD_AS_NEEDED@
638 LEX = @LEX@
639 LEXLIB = @LEXLIB@
640 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
641@@ -229,6 +231,7 @@ SHELL = @SHELL@
642 STRIP = @STRIP@
643 USE_NLS = @USE_NLS@
644 VERSION = @VERSION@
645+WEXTRA = @WEXTRA@
646 XGETTEXT = @XGETTEXT@
647 XGETTEXT_015 = @XGETTEXT_015@
648 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
649@@ -291,10 +294,9 @@ zip_LIBS = @zip_LIBS@
650 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
651 -I$(srcdir)/../libelf
652 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
653- $($(*F)_no_Werror),,-Werror) $(if \
654- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
655+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
656 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
657- $(am__append_1) -fpic
658+ $(am__append_1) $(am__append_2) -fpic
659 @MUDFLAP_FALSE@libmudflap =
660 @MUDFLAP_TRUE@libmudflap = -lmudflap
661 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
662--- elfutils/libasm/ChangeLog 328--- elfutils/libasm/ChangeLog
663+++ elfutils/libasm/ChangeLog 329+++ elfutils/libasm/ChangeLog
664@@ -75,6 +75,11 @@ 330@@ -75,6 +75,11 @@
@@ -673,60 +339,6 @@
673 2005-02-15 Ulrich Drepper <drepper@redhat.com> 339 2005-02-15 Ulrich Drepper <drepper@redhat.com>
674 340
675 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. 341 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
676--- elfutils/libasm/Makefile.in
677+++ elfutils/libasm/Makefile.in
678@@ -83,10 +83,11 @@ host_triplet = @host@
679 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
680 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
681 $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
682-@MUDFLAP_TRUE@am__append_1 = -fmudflap
683+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
684+@MUDFLAP_TRUE@am__append_2 = -fmudflap
685 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
686 @MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS =
687-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread
688+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
689 subdir = libasm
690 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
691 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
692@@ -250,6 +251,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
693 INSTALL_SCRIPT = @INSTALL_SCRIPT@
694 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
695 LDFLAGS = @LDFLAGS@
696+LD_AS_NEEDED = @LD_AS_NEEDED@
697 LEX = @LEX@
698 LEXLIB = @LEXLIB@
699 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
700@@ -281,6 +283,7 @@ SHELL = @SHELL@
701 STRIP = @STRIP@
702 USE_NLS = @USE_NLS@
703 VERSION = 1
704+WEXTRA = @WEXTRA@
705 XGETTEXT = @XGETTEXT@
706 XGETTEXT_015 = @XGETTEXT_015@
707 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
708@@ -344,10 +347,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
709 -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
710 -I$(top_srcdir)/libdw
711 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
712- $($(*F)_no_Werror),,-Werror) $(if \
713- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
714+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
715 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
716- $(am__append_1)
717+ $(am__append_1) $(am__append_2)
718 @MUDFLAP_FALSE@libmudflap =
719 @MUDFLAP_TRUE@libmudflap = -lmudflap
720 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
721@@ -376,7 +378,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
722
723 @MUDFLAP_FALSE@libasm_pic_a_SOURCES =
724 @MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
725-@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2)
726+@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_3)
727 @MUDFLAP_FALSE@libasm_so_SOURCES =
728 noinst_HEADERS = libasmP.h symbolhash.h
729 EXTRA_DIST = libasm.map
730--- elfutils/libcpu/ChangeLog 342--- elfutils/libcpu/ChangeLog
731+++ elfutils/libcpu/ChangeLog 343+++ elfutils/libcpu/ChangeLog
732@@ -47,6 +47,9 @@ 344@@ -47,6 +47,9 @@
@@ -761,47 +373,6 @@
761 } 373 }
762 } 374 }
763 else 375 else
764--- elfutils/libcpu/Makefile.in
765+++ elfutils/libcpu/Makefile.in
766@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
767 $(srcdir)/Makefile.am i386_lex.c i386_parse.c \
768 $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
769 $(am__noinst_HEADERS_DIST) ChangeLog
770-@MUDFLAP_TRUE@am__append_1 = -fmudflap
771+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
772+@MUDFLAP_TRUE@am__append_2 = -fmudflap
773 @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
774 subdir = libcpu
775 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
776@@ -225,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
777 INSTALL_SCRIPT = @INSTALL_SCRIPT@
778 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
779 LDFLAGS = @LDFLAGS@
780+LD_AS_NEEDED = @LD_AS_NEEDED@
781 LEX = @LEX@
782 LEXLIB = @LEXLIB@
783 LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
784@@ -256,6 +258,7 @@ SHELL = @SHELL@
785 STRIP = @STRIP@
786 USE_NLS = @USE_NLS@
787 VERSION = @VERSION@
788+WEXTRA = @WEXTRA@
789 XGETTEXT = @XGETTEXT@
790 XGETTEXT_015 = @XGETTEXT_015@
791 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
792@@ -319,10 +322,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
793 -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
794 -I$(srcdir)/../libdw -I$(srcdir)/../libasm
795 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
796- $($(*F)_no_Werror),,-Werror) $(if \
797- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
798+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
799 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
800- $(am__append_1) -fpic -fdollars-in-identifiers
801+ $(am__append_1) $(am__append_2) -fpic -fdollars-in-identifiers
802 @MUDFLAP_FALSE@libmudflap =
803 @MUDFLAP_TRUE@libmudflap = -lmudflap
804 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
805--- elfutils/libdw/ChangeLog 376--- elfutils/libdw/ChangeLog
806+++ elfutils/libdw/ChangeLog 377+++ elfutils/libdw/ChangeLog
807@@ -346,6 +346,10 @@ 378@@ -346,6 +346,10 @@
@@ -866,49 +437,6 @@
866 /* Return attribute code of given attribute. */ 437 /* Return attribute code of given attribute. */
867 __libdw_extern_inline unsigned int 438 __libdw_extern_inline unsigned int
868 dwarf_whatattr (Dwarf_Attribute *attr) 439 dwarf_whatattr (Dwarf_Attribute *attr)
869--- elfutils/libdw/Makefile.in
870+++ elfutils/libdw/Makefile.in
871@@ -84,8 +84,9 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
872 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
873 $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
874 ChangeLog
875-@MUDFLAP_TRUE@am__append_1 = -fmudflap
876-@BUILD_STATIC_TRUE@am__append_2 = -fpic
877+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
878+@MUDFLAP_TRUE@am__append_2 = -fmudflap
879+@BUILD_STATIC_TRUE@am__append_3 = -fpic
880 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
881 @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =
882 subdir = libdw
883@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
884 INSTALL_SCRIPT = @INSTALL_SCRIPT@
885 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
886 LDFLAGS = @LDFLAGS@
887+LD_AS_NEEDED = @LD_AS_NEEDED@
888 LEX = @LEX@
889 LEXLIB = @LEXLIB@
890 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
891@@ -326,6 +328,7 @@ SHELL = @SHELL@
892 STRIP = @STRIP@
893 USE_NLS = @USE_NLS@
894 VERSION = 1
895+WEXTRA = @WEXTRA@
896 XGETTEXT = @XGETTEXT@
897 XGETTEXT_015 = @XGETTEXT_015@
898 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
899@@ -388,10 +391,9 @@ zip_LIBS = @zip_LIBS@
900 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
901 -I$(srcdir)/../libelf
902 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
903- $($(*F)_no_Werror),,-Werror) $(if \
904- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
905+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
906 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
907- $(am__append_1) $(am__append_2)
908+ $(am__append_1) $(am__append_2) $(am__append_3)
909 @MUDFLAP_FALSE@libmudflap =
910 @MUDFLAP_TRUE@libmudflap = -lmudflap
911 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
912--- elfutils/libdwfl/ChangeLog 440--- elfutils/libdwfl/ChangeLog
913+++ elfutils/libdwfl/ChangeLog 441+++ elfutils/libdwfl/ChangeLog
914@@ -283,6 +283,21 @@ 442@@ -283,6 +283,21 @@
@@ -1014,75 +542,6 @@
1014 } 542 }
1015 } 543 }
1016 544
1017--- elfutils/libdwfl/Makefile.in
1018+++ elfutils/libdwfl/Makefile.in
1019@@ -82,11 +82,12 @@ host_triplet = @host@
1020 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
1021 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
1022 $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
1023-@MUDFLAP_TRUE@am__append_1 = -fmudflap
1024-@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a
1025-@ZLIB_TRUE@am__append_3 = gzip.c
1026-@BZLIB_TRUE@am__append_4 = bzip2.c
1027-@LZMA_TRUE@am__append_5 = lzma.c
1028+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
1029+@MUDFLAP_TRUE@am__append_2 = -fmudflap
1030+@MUDFLAP_FALSE@am__append_3 = libdwfl_pic.a
1031+@ZLIB_TRUE@am__append_4 = gzip.c
1032+@BZLIB_TRUE@am__append_5 = bzip2.c
1033+@LZMA_TRUE@am__append_6 = lzma.c
1034 @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =
1035 subdir = libdwfl
1036 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1037@@ -289,6 +290,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1038 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1039 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1040 LDFLAGS = @LDFLAGS@
1041+LD_AS_NEEDED = @LD_AS_NEEDED@
1042 LEX = @LEX@
1043 LEXLIB = @LEXLIB@
1044 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1045@@ -320,6 +322,7 @@ SHELL = @SHELL@
1046 STRIP = @STRIP@
1047 USE_NLS = @USE_NLS@
1048 VERSION = 1
1049+WEXTRA = @WEXTRA@
1050 XGETTEXT = @XGETTEXT@
1051 XGETTEXT_015 = @XGETTEXT_015@
1052 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1053@@ -383,10 +386,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
1054 -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
1055 -I$(srcdir)/../libdw
1056 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1057- $($(*F)_no_Werror),,-Werror) $(if \
1058- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1059+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1060 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1061- $(am__append_1)
1062+ $(am__append_1) $(am__append_2)
1063 @MUDFLAP_FALSE@libmudflap =
1064 @MUDFLAP_TRUE@libmudflap = -lmudflap
1065 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
1066@@ -394,7 +396,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
1067
1068 CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
1069 textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
1070-noinst_LIBRARIES = libdwfl.a $(am__append_2)
1071+noinst_LIBRARIES = libdwfl.a $(am__append_3)
1072 pkginclude_HEADERS = libdwfl.h
1073 libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \
1074 dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \
1075@@ -417,8 +419,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
1076 dwfl_module_register_names.c dwfl_segment_report_module.c \
1077 link_map.c core-file.c open.c image-header.c dwfl_frame.c \
1078 frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
1079- linux-core-attach.c dwfl_frame_regs.c $(am__append_3) \
1080- $(am__append_4) $(am__append_5)
1081+ linux-core-attach.c dwfl_frame_regs.c $(am__append_4) \
1082+ $(am__append_5) $(am__append_6)
1083 @MUDFLAP_FALSE@libdwfl = $(libdw)
1084 @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
1085 @MUDFLAP_FALSE@libdw = ../libdw/libdw.so
1086--- elfutils/libebl/ChangeLog 545--- elfutils/libebl/ChangeLog
1087+++ elfutils/libebl/ChangeLog 546+++ elfutils/libebl/ChangeLog
1088@@ -738,6 +738,11 @@ 547@@ -738,6 +738,11 @@
@@ -1097,47 +556,6 @@
1097 2005-05-21 Ulrich Drepper <drepper@redhat.com> 556 2005-05-21 Ulrich Drepper <drepper@redhat.com>
1098 557
1099 * libebl_x86_64.map: Add x86_64_core_note. 558 * libebl_x86_64.map: Add x86_64_core_note.
1100--- elfutils/libebl/Makefile.in
1101+++ elfutils/libebl/Makefile.in
1102@@ -82,7 +82,8 @@ host_triplet = @host@
1103 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
1104 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
1105 $(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
1106-@MUDFLAP_TRUE@am__append_1 = -fmudflap
1107+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
1108+@MUDFLAP_TRUE@am__append_2 = -fmudflap
1109 subdir = libebl
1110 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1111 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
1112@@ -249,6 +250,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1113 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1114 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1115 LDFLAGS = @LDFLAGS@
1116+LD_AS_NEEDED = @LD_AS_NEEDED@
1117 LEX = @LEX@
1118 LEXLIB = @LEXLIB@
1119 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1120@@ -280,6 +282,7 @@ SHELL = @SHELL@
1121 STRIP = @STRIP@
1122 USE_NLS = @USE_NLS@
1123 VERSION = 1
1124+WEXTRA = @WEXTRA@
1125 XGETTEXT = @XGETTEXT@
1126 XGETTEXT_015 = @XGETTEXT_015@
1127 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1128@@ -343,10 +346,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
1129 -I$(srcdir)/../libelf -I$(srcdir)/../libdw \
1130 -I$(srcdir)/../libasm
1131 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1132- $($(*F)_no_Werror),,-Werror) $(if \
1133- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1134+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1135 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1136- $(am__append_1) -fpic
1137+ $(am__append_1) $(am__append_2) -fpic
1138 @MUDFLAP_FALSE@libmudflap =
1139 @MUDFLAP_TRUE@libmudflap = -lmudflap
1140 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
1141--- elfutils/libelf/ChangeLog 559--- elfutils/libelf/ChangeLog
1142+++ elfutils/libelf/ChangeLog 560+++ elfutils/libelf/ChangeLog
1143@@ -85,6 +85,11 @@ 561@@ -85,6 +85,11 @@
@@ -1204,98 +622,6 @@
1204 len -= 4; 622 len -= 4;
1205 } 623 }
1206 } 624 }
1207--- elfutils/libelf/Makefile.in
1208+++ elfutils/libelf/Makefile.in
1209@@ -84,11 +84,12 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
1210 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
1211 $(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
1212 ChangeLog
1213-@MUDFLAP_TRUE@am__append_1 = -fmudflap
1214-@BUILD_STATIC_TRUE@am__append_2 = -fpic
1215+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
1216+@MUDFLAP_TRUE@am__append_2 = -fmudflap
1217+@BUILD_STATIC_TRUE@am__append_3 = -fpic
1218 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
1219 @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
1220-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
1221+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread
1222 subdir = libelf
1223 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1224 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
1225@@ -293,6 +294,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1226 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1227 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1228 LDFLAGS = @LDFLAGS@
1229+LD_AS_NEEDED = @LD_AS_NEEDED@
1230 LEX = @LEX@
1231 LEXLIB = @LEXLIB@
1232 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1233@@ -324,6 +326,7 @@ SHELL = @SHELL@
1234 STRIP = @STRIP@
1235 USE_NLS = @USE_NLS@
1236 VERSION = 1
1237+WEXTRA = @WEXTRA@
1238 XGETTEXT = @XGETTEXT@
1239 XGETTEXT_015 = @XGETTEXT_015@
1240 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1241@@ -385,10 +388,9 @@ top_srcdir = @top_srcdir@
1242 zip_LIBS = @zip_LIBS@
1243 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
1244 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1245- $($(*F)_no_Werror),,-Werror) $(if \
1246- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1247+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1248 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1249- $(am__append_1) $(am__append_2)
1250+ $(am__append_1) $(am__append_2) $(am__append_3)
1251 @MUDFLAP_FALSE@libmudflap =
1252 @MUDFLAP_TRUE@libmudflap = -lmudflap
1253 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
1254@@ -453,7 +455,7 @@ libelf_a_SOURCES = elf_version.c elf_has
1255
1256 @MUDFLAP_FALSE@libelf_pic_a_SOURCES =
1257 @MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
1258-@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3)
1259+@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_4)
1260 @MUDFLAP_FALSE@libelf_so_SOURCES =
1261 noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
1262 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
1263--- elfutils/m4/Makefile.in
1264+++ elfutils/m4/Makefile.in
1265@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1266 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1267 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1268 LDFLAGS = @LDFLAGS@
1269+LD_AS_NEEDED = @LD_AS_NEEDED@
1270 LEX = @LEX@
1271 LEXLIB = @LEXLIB@
1272 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1273@@ -176,6 +177,7 @@ SHELL = @SHELL@
1274 STRIP = @STRIP@
1275 USE_NLS = @USE_NLS@
1276 VERSION = @VERSION@
1277+WEXTRA = @WEXTRA@
1278 XGETTEXT = @XGETTEXT@
1279 XGETTEXT_015 = @XGETTEXT_015@
1280 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1281--- elfutils/Makefile.in
1282+++ elfutils/Makefile.in
1283@@ -263,6 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1284 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1285 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1286 LDFLAGS = @LDFLAGS@
1287+LD_AS_NEEDED = @LD_AS_NEEDED@
1288 LEX = @LEX@
1289 LEXLIB = @LEXLIB@
1290 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1291@@ -294,6 +295,7 @@ SHELL = @SHELL@
1292 STRIP = @STRIP@
1293 USE_NLS = @USE_NLS@
1294 VERSION = @VERSION@
1295+WEXTRA = @WEXTRA@
1296 XGETTEXT = @XGETTEXT@
1297 XGETTEXT_015 = @XGETTEXT_015@
1298 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1299--- elfutils/src/addr2line.c 625--- elfutils/src/addr2line.c
1300+++ elfutils/src/addr2line.c 626+++ elfutils/src/addr2line.c
1301@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl 627@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl
@@ -1438,98 +764,6 @@
1438 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl 764 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
1439 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ 765 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
1440 $(demanglelib) 766 $(demanglelib)
1441--- elfutils/src/Makefile.in
1442+++ elfutils/src/Makefile.in
1443@@ -85,7 +85,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
1444 $(srcdir)/Makefile.am ldlex.c ldscript.c \
1445 $(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
1446 $(noinst_HEADERS) ChangeLog
1447-@MUDFLAP_TRUE@am__append_1 = -fmudflap
1448+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
1449+@MUDFLAP_TRUE@am__append_2 = -fmudflap
1450 bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
1451 strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
1452 findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
1453@@ -94,9 +95,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
1454 @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
1455 # We never build this library but we need to get the dependency files
1456 # of all the linker backends that might be used in a non-generic linker.
1457-@NEVER_TRUE@am__append_2 = libdummy.a
1458+@NEVER_TRUE@am__append_3 = libdummy.a
1459 # -ldl is always needed for libebl.
1460-@NATIVE_LD_TRUE@am__append_3 = libld_elf.a
1461+@NATIVE_LD_TRUE@am__append_4 = libld_elf.a
1462 @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
1463 subdir = src
1464 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1465@@ -164,7 +165,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
1466 versionhash.$(OBJEXT)
1467 ld_OBJECTS = $(am_ld_OBJECTS)
1468 ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \
1469- $(am__append_3)
1470+ $(am__append_4)
1471 ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
1472 $@
1473 am_libld_elf_i386_so_OBJECTS =
1474@@ -347,6 +348,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1475 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1476 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1477 LDFLAGS = @LDFLAGS@
1478+LD_AS_NEEDED = @LD_AS_NEEDED@
1479 LEX = @LEX@
1480 LEXLIB = @LEXLIB@
1481 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1482@@ -378,6 +380,7 @@ SHELL = @SHELL@
1483 STRIP = @STRIP@
1484 USE_NLS = @USE_NLS@
1485 VERSION = @VERSION@
1486+WEXTRA = @WEXTRA@
1487 XGETTEXT = @XGETTEXT@
1488 XGETTEXT_015 = @XGETTEXT_015@
1489 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1490@@ -442,10 +445,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
1491 -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
1492 -I$(srcdir)/../libasm
1493 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1494- $($(*F)_no_Werror),,-Werror) $(if \
1495- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1496+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1497 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1498- $(am__append_1)
1499+ $(am__append_1) $(am__append_2)
1500 @MUDFLAP_FALSE@libmudflap =
1501 @MUDFLAP_TRUE@libmudflap = -lmudflap
1502 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
1503@@ -461,8 +463,8 @@ AM_LFLAGS = -Pld -olex.yy.c
1504 native_ld = @native_ld@
1505 ld_dsos = libld_elf_i386_pic.a
1506 @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
1507-@NATIVE_LD_FALSE@ $(am__append_2)
1508-@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)
1509+@NATIVE_LD_FALSE@ $(am__append_3)
1510+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3)
1511 @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
1512 @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
1513 ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
1514@@ -491,6 +493,9 @@ strings_no_Wformat = yes
1515 addr2line_no_Wformat = yes
1516 # XXX While the file is not finished, don't warn about this
1517 ldgeneric_no_Wunused = yes
1518+
1519+# Buggy old compilers.
1520+readelf_no_Werror = yes
1521 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
1522 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
1523 $(demanglelib)
1524@@ -498,7 +503,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
1525 size_LDADD = $(libelf) $(libeu) $(libmudflap)
1526 strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
1527 ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
1528- $(am__append_3)
1529+ $(am__append_4)
1530 ld_LDFLAGS = -rdynamic
1531 elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
1532 findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
1533--- elfutils/src/readelf.c 767--- elfutils/src/readelf.c
1534+++ elfutils/src/readelf.c 768+++ elfutils/src/readelf.c
1535@@ -4171,10 +4171,12 @@ listptr_base (struct listptr *p) 769@@ -4171,10 +4171,12 @@ listptr_base (struct listptr *p)
@@ -1719,96 +953,3 @@
1719 { 953 {
1720 default: 954 default:
1721 case 0: 955 case 0:
1722--- elfutils/tests/Makefile.in
1723+++ elfutils/tests/Makefile.in
1724@@ -80,14 +80,15 @@ host_triplet = @host@
1725 DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
1726 $(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
1727 $(top_srcdir)/config/test-driver ChangeLog
1728-@MUDFLAP_TRUE@am__append_1 = -fmudflap
1729-@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
1730+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
1731+@MUDFLAP_TRUE@am__append_2 = -fmudflap
1732+@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
1733 @STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl \
1734 @STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
1735 @STANDALONE_FALSE@ -I$(top_srcdir)/lib -I..
1736
1737-@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf
1738-@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)
1739+@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf
1740+@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH)
1741 check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
1742 newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
1743 sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
1744@@ -111,7 +112,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
1745 varlocs$(EXEEXT) backtrace$(EXEEXT) backtrace-child$(EXEEXT) \
1746 backtrace-data$(EXEEXT) backtrace-dwarf$(EXEEXT) \
1747 $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
1748-@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
1749+@BIARCH_TRUE@am__append_6 = backtrace-child-biarch
1750 TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
1751 test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
1752 update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
1753@@ -151,14 +152,14 @@ TESTS = run-arextract.sh run-arsymtest.s
1754 run-backtrace-native-core-biarch.sh \
1755 run-backtrace-core-x86_64.sh run-backtrace-core-i386.sh \
1756 run-backtrace-core-ppc.sh run-backtrace-core-s390x.sh \
1757- run-backtrace-core-s390.sh $(am__EXEEXT_2) $(am__append_8) \
1758- $(am__EXEEXT_4) $(am__append_11)
1759-@STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
1760+ run-backtrace-core-s390.sh $(am__EXEEXT_2) $(am__append_9) \
1761+ $(am__EXEEXT_4) $(am__append_12)
1762 @STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
1763-@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
1764-@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
1765+@STANDALONE_FALSE@am__append_8 = msg_tst md5-sha1-test
1766+@LZMA_TRUE@am__append_9 = run-readelf-s.sh run-dwflsyms.sh
1767 @HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
1768-@ENABLE_DWZ_TRUE@am__append_11 = run-readelf-dwz-multi.sh run-allfcts-multi.sh
1769+@HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS)
1770+@ENABLE_DWZ_TRUE@am__append_12 = run-readelf-dwz-multi.sh run-allfcts-multi.sh
1771 subdir = tests
1772 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1773 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
1774@@ -780,6 +781,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1775 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1776 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1777 LDFLAGS = @LDFLAGS@
1778+LD_AS_NEEDED = @LD_AS_NEEDED@
1779 LEX = @LEX@
1780 LEXLIB = @LEXLIB@
1781 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1782@@ -811,6 +813,7 @@ SHELL = @SHELL@
1783 STRIP = @STRIP@
1784 USE_NLS = @USE_NLS@
1785 VERSION = @VERSION@
1786+WEXTRA = @WEXTRA@
1787 XGETTEXT = @XGETTEXT@
1788 XGETTEXT_015 = @XGETTEXT_015@
1789 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1790@@ -870,12 +873,11 @@ top_build_prefix = @top_build_prefix@
1791 top_builddir = @top_builddir@
1792 top_srcdir = @top_srcdir@
1793 zip_LIBS = @zip_LIBS@
1794-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
1795+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)
1796 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1797- $($(*F)_no_Werror),,-Werror) $(if \
1798- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1799+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1800 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1801- $(am__append_1)
1802+ $(am__append_1) $(am__append_2)
1803 @MUDFLAP_FALSE@libmudflap =
1804 @MUDFLAP_TRUE@libmudflap = -lmudflap
1805 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
1806@@ -885,7 +887,7 @@ CLEANFILES = *.gcno *.gcda
1807 textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
1808 @MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
1809 @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
1810-AM_LDFLAGS = $(am__append_3) $(am__append_4)
1811+AM_LDFLAGS = $(am__append_4) $(am__append_5)
1812 @TESTS_RPATH_FALSE@tests_rpath = no
1813 @TESTS_RPATH_TRUE@tests_rpath = yes
1814 asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
diff --git a/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
index 4b3bd649cb..b8a912c412 100644
--- a/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
@@ -50,44 +50,6 @@ Index: elfutils-0.148/backends/Makefile.am
50 $(textrel_check) 50 $(textrel_check)
51 51
52 libebl_i386.so: $(cpu_i386) 52 libebl_i386.so: $(cpu_i386)
53Index: elfutils-0.148/backends/Makefile.in
54===================================================================
55--- elfutils-0.148.orig/backends/Makefile.in 2010-06-28 19:07:33.000000000 +0000
56+++ elfutils-0.148/backends/Makefile.in 2010-07-03 13:04:07.000000000 +0000
57@@ -165,6 +165,7 @@
58 INSTALL_SCRIPT = @INSTALL_SCRIPT@
59 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
60 LDFLAGS = @LDFLAGS@
61+LD_AS_NEEDED = @LD_AS_NEEDED@
62 LEX = @LEX@
63 LEXLIB = @LEXLIB@
64 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
65@@ -194,6 +195,7 @@
66 STRIP = @STRIP@
67 USE_NLS = @USE_NLS@
68 VERSION = @VERSION@
69+WEXTRA = @WEXTRA@
70 XGETTEXT = @XGETTEXT@
71 XGETTEXT_015 = @XGETTEXT_015@
72 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
73@@ -257,7 +259,7 @@
74 -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
75 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
76 $($(*F)_no_Werror),,-Werror) $(if \
77- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
78+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
79 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
80 $(am__append_1)
81 @MUDFLAP_FALSE@libmudflap =
82@@ -698,7 +700,7 @@
83 $(LINK) -shared -o $(@:.map=.so) \
84 -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
85 -Wl,--version-script,$(@:.so=.map) \
86- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
87+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
88 $(textrel_check)
89
90 libebl_i386.so: $(cpu_i386)
91Index: elfutils-0.148/ChangeLog 53Index: elfutils-0.148/ChangeLog
92=================================================================== 54===================================================================
93--- elfutils-0.148.orig/ChangeLog 2010-04-21 14:26:40.000000000 +0000 55--- elfutils-0.148.orig/ChangeLog 2010-04-21 14:26:40.000000000 +0000
@@ -172,26 +134,6 @@ Index: elfutils-0.148/config/eu.am
172 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ 134 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
173 $($(*F)_CFLAGS) 135 $($(*F)_CFLAGS)
174 136
175Index: elfutils-0.148/config/Makefile.in
176===================================================================
177--- elfutils-0.148.orig/config/Makefile.in 2010-06-28 19:07:34.000000000 +0000
178+++ elfutils-0.148/config/Makefile.in 2010-07-03 13:04:07.000000000 +0000
179@@ -76,6 +76,7 @@
180 INSTALL_SCRIPT = @INSTALL_SCRIPT@
181 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
182 LDFLAGS = @LDFLAGS@
183+LD_AS_NEEDED = @LD_AS_NEEDED@
184 LEX = @LEX@
185 LEXLIB = @LEXLIB@
186 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
187@@ -105,6 +106,7 @@
188 STRIP = @STRIP@
189 USE_NLS = @USE_NLS@
190 VERSION = @VERSION@
191+WEXTRA = @WEXTRA@
192 XGETTEXT = @XGETTEXT@
193 XGETTEXT_015 = @XGETTEXT_015@
194 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
195Index: elfutils-0.148/config.h.in 137Index: elfutils-0.148/config.h.in
196=================================================================== 138===================================================================
197--- elfutils-0.148.orig/config.h.in 2010-06-28 19:07:37.000000000 +0000 139--- elfutils-0.148.orig/config.h.in 2010-06-28 19:07:37.000000000 +0000
@@ -349,35 +291,6 @@ Index: elfutils-0.148/lib/eu-config.h
349 291
350 #ifdef SHARED 292 #ifdef SHARED
351 # define OLD_VERSION(name, version) \ 293 # define OLD_VERSION(name, version) \
352Index: elfutils-0.148/lib/Makefile.in
353===================================================================
354--- elfutils-0.148.orig/lib/Makefile.in 2010-06-28 19:07:33.000000000 +0000
355+++ elfutils-0.148/lib/Makefile.in 2010-07-03 13:04:07.000000000 +0000
356@@ -99,6 +99,7 @@
357 INSTALL_SCRIPT = @INSTALL_SCRIPT@
358 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
359 LDFLAGS = @LDFLAGS@
360+LD_AS_NEEDED = @LD_AS_NEEDED@
361 LEX = @LEX@
362 LEXLIB = @LEXLIB@
363 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
364@@ -128,6 +129,7 @@
365 STRIP = @STRIP@
366 USE_NLS = @USE_NLS@
367 VERSION = @VERSION@
368+WEXTRA = @WEXTRA@
369 XGETTEXT = @XGETTEXT@
370 XGETTEXT_015 = @XGETTEXT_015@
371 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
372@@ -190,7 +192,7 @@
373 -I$(srcdir)/../libelf
374 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
375 $($(*F)_no_Werror),,-Werror) $(if \
376- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
377+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
378 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
379 $(am__append_1) -fpic
380 @MUDFLAP_FALSE@libmudflap =
381Index: elfutils-0.148/libasm/ChangeLog 294Index: elfutils-0.148/libasm/ChangeLog
382=================================================================== 295===================================================================
383--- elfutils-0.148.orig/libasm/ChangeLog 2010-03-05 05:48:23.000000000 +0000 296--- elfutils-0.148.orig/libasm/ChangeLog 2010-03-05 05:48:23.000000000 +0000
@@ -394,35 +307,6 @@ Index: elfutils-0.148/libasm/ChangeLog
394 2005-02-15 Ulrich Drepper <drepper@redhat.com> 307 2005-02-15 Ulrich Drepper <drepper@redhat.com>
395 308
396 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. 309 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
397Index: elfutils-0.148/libasm/Makefile.in
398===================================================================
399--- elfutils-0.148.orig/libasm/Makefile.in 2010-06-28 19:07:33.000000000 +0000
400+++ elfutils-0.148/libasm/Makefile.in 2010-07-03 13:04:07.000000000 +0000
401@@ -147,6 +147,7 @@
402 INSTALL_SCRIPT = @INSTALL_SCRIPT@
403 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
404 LDFLAGS = @LDFLAGS@
405+LD_AS_NEEDED = @LD_AS_NEEDED@
406 LEX = @LEX@
407 LEXLIB = @LEXLIB@
408 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
409@@ -176,6 +177,7 @@
410 STRIP = @STRIP@
411 USE_NLS = @USE_NLS@
412 VERSION = 1
413+WEXTRA = @WEXTRA@
414 XGETTEXT = @XGETTEXT@
415 XGETTEXT_015 = @XGETTEXT_015@
416 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
417@@ -239,7 +241,7 @@
418 -I$(top_srcdir)/libdw
419 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
420 $($(*F)_no_Werror),,-Werror) $(if \
421- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
422+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
423 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
424 $(am__append_1)
425 @MUDFLAP_FALSE@libmudflap =
426Index: elfutils-0.148/libcpu/ChangeLog 310Index: elfutils-0.148/libcpu/ChangeLog
427=================================================================== 311===================================================================
428--- elfutils-0.148.orig/libcpu/ChangeLog 2010-03-05 05:48:23.000000000 +0000 312--- elfutils-0.148.orig/libcpu/ChangeLog 2010-03-05 05:48:23.000000000 +0000
@@ -461,35 +345,6 @@ Index: elfutils-0.148/libcpu/i386_disasm.c
461 } 345 }
462 } 346 }
463 else 347 else
464Index: elfutils-0.148/libcpu/Makefile.in
465===================================================================
466--- elfutils-0.148.orig/libcpu/Makefile.in 2010-06-28 19:07:33.000000000 +0000
467+++ elfutils-0.148/libcpu/Makefile.in 2010-07-03 13:04:07.000000000 +0000
468@@ -116,6 +116,7 @@
469 INSTALL_SCRIPT = @INSTALL_SCRIPT@
470 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
471 LDFLAGS = @LDFLAGS@
472+LD_AS_NEEDED = @LD_AS_NEEDED@
473 LEX = @LEX@
474 LEXLIB = @LEXLIB@
475 LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
476@@ -145,6 +146,7 @@
477 STRIP = @STRIP@
478 USE_NLS = @USE_NLS@
479 VERSION = @VERSION@
480+WEXTRA = @WEXTRA@
481 XGETTEXT = @XGETTEXT@
482 XGETTEXT_015 = @XGETTEXT_015@
483 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
484@@ -208,7 +210,7 @@
485 -I$(srcdir)/../libdw -I$(srcdir)/../libasm
486 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
487 $($(*F)_no_Werror),,-Werror) $(if \
488- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
489+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
490 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
491 $(am__append_1) -fpic -fdollars-in-identifiers
492 @MUDFLAP_FALSE@libmudflap =
493Index: elfutils-0.148/libdw/ChangeLog 348Index: elfutils-0.148/libdw/ChangeLog
494=================================================================== 349===================================================================
495--- elfutils-0.148.orig/libdw/ChangeLog 2010-06-28 19:05:56.000000000 +0000 350--- elfutils-0.148.orig/libdw/ChangeLog 2010-06-28 19:05:56.000000000 +0000
@@ -530,35 +385,6 @@ Index: elfutils-0.148/libdw/libdw.h
530 /* Return attribute code of given attribute. */ 385 /* Return attribute code of given attribute. */
531 __libdw_extern_inline unsigned int 386 __libdw_extern_inline unsigned int
532 dwarf_whatattr (Dwarf_Attribute *attr) 387 dwarf_whatattr (Dwarf_Attribute *attr)
533Index: elfutils-0.148/libdw/Makefile.in
534===================================================================
535--- elfutils-0.148.orig/libdw/Makefile.in 2010-06-28 19:07:33.000000000 +0000
536+++ elfutils-0.148/libdw/Makefile.in 2010-07-03 13:04:07.000000000 +0000
537@@ -191,6 +191,7 @@
538 INSTALL_SCRIPT = @INSTALL_SCRIPT@
539 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
540 LDFLAGS = @LDFLAGS@
541+LD_AS_NEEDED = @LD_AS_NEEDED@
542 LEX = @LEX@
543 LEXLIB = @LEXLIB@
544 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
545@@ -220,6 +221,7 @@
546 STRIP = @STRIP@
547 USE_NLS = @USE_NLS@
548 VERSION = 1
549+WEXTRA = @WEXTRA@
550 XGETTEXT = @XGETTEXT@
551 XGETTEXT_015 = @XGETTEXT_015@
552 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
553@@ -282,7 +284,7 @@
554 -I$(srcdir)/../libelf
555 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
556 $($(*F)_no_Werror),,-Werror) $(if \
557- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
558+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
559 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
560 $(am__append_1) $(am__append_2)
561 @MUDFLAP_FALSE@libmudflap =
562Index: elfutils-0.148/libdwfl/ChangeLog 388Index: elfutils-0.148/libdwfl/ChangeLog
563=================================================================== 389===================================================================
564--- elfutils-0.148.orig/libdwfl/ChangeLog 2010-06-28 19:05:56.000000000 +0000 390--- elfutils-0.148.orig/libdwfl/ChangeLog 2010-06-28 19:05:56.000000000 +0000
@@ -575,35 +401,6 @@ Index: elfutils-0.148/libdwfl/ChangeLog
575 * Makefile.am (noinst_HEADERS): Add loc2c.c. 401 * Makefile.am (noinst_HEADERS): Add loc2c.c.
576 402
577 * test2.c (main): Check sscanf result to quiet warning. 403 * test2.c (main): Check sscanf result to quiet warning.
578Index: elfutils-0.148/libdwfl/Makefile.in
579===================================================================
580--- elfutils-0.148.orig/libdwfl/Makefile.in 2010-06-28 19:07:33.000000000 +0000
581+++ elfutils-0.148/libdwfl/Makefile.in 2010-07-03 13:04:07.000000000 +0000
582@@ -181,6 +181,7 @@
583 INSTALL_SCRIPT = @INSTALL_SCRIPT@
584 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
585 LDFLAGS = @LDFLAGS@
586+LD_AS_NEEDED = @LD_AS_NEEDED@
587 LEX = @LEX@
588 LEXLIB = @LEXLIB@
589 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
590@@ -210,6 +211,7 @@
591 STRIP = @STRIP@
592 USE_NLS = @USE_NLS@
593 VERSION = 1
594+WEXTRA = @WEXTRA@
595 XGETTEXT = @XGETTEXT@
596 XGETTEXT_015 = @XGETTEXT_015@
597 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
598@@ -273,7 +275,7 @@
599 -I$(srcdir)/../libdw
600 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
601 $($(*F)_no_Werror),,-Werror) $(if \
602- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
603+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
604 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
605 $(am__append_1)
606 @MUDFLAP_FALSE@libmudflap =
607Index: elfutils-0.148/libebl/ChangeLog 404Index: elfutils-0.148/libebl/ChangeLog
608=================================================================== 405===================================================================
609--- elfutils-0.148.orig/libebl/ChangeLog 2010-03-05 05:48:23.000000000 +0000 406--- elfutils-0.148.orig/libebl/ChangeLog 2010-03-05 05:48:23.000000000 +0000
@@ -620,35 +417,6 @@ Index: elfutils-0.148/libebl/ChangeLog
620 2005-05-21 Ulrich Drepper <drepper@redhat.com> 417 2005-05-21 Ulrich Drepper <drepper@redhat.com>
621 418
622 * libebl_x86_64.map: Add x86_64_core_note. 419 * libebl_x86_64.map: Add x86_64_core_note.
623Index: elfutils-0.148/libebl/Makefile.in
624===================================================================
625--- elfutils-0.148.orig/libebl/Makefile.in 2010-06-28 19:07:34.000000000 +0000
626+++ elfutils-0.148/libebl/Makefile.in 2010-07-03 13:04:07.000000000 +0000
627@@ -143,6 +143,7 @@
628 INSTALL_SCRIPT = @INSTALL_SCRIPT@
629 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
630 LDFLAGS = @LDFLAGS@
631+LD_AS_NEEDED = @LD_AS_NEEDED@
632 LEX = @LEX@
633 LEXLIB = @LEXLIB@
634 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
635@@ -172,6 +173,7 @@
636 STRIP = @STRIP@
637 USE_NLS = @USE_NLS@
638 VERSION = 1
639+WEXTRA = @WEXTRA@
640 XGETTEXT = @XGETTEXT@
641 XGETTEXT_015 = @XGETTEXT_015@
642 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
643@@ -235,7 +237,7 @@
644 -I$(srcdir)/../libasm
645 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
646 $($(*F)_no_Werror),,-Werror) $(if \
647- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
648+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
649 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
650 $(am__append_1) -fpic
651 @MUDFLAP_FALSE@libmudflap =
652Index: elfutils-0.148/libelf/ChangeLog 420Index: elfutils-0.148/libelf/ChangeLog
653=================================================================== 421===================================================================
654--- elfutils-0.148.orig/libelf/ChangeLog 2010-06-14 21:17:20.000000000 +0000 422--- elfutils-0.148.orig/libelf/ChangeLog 2010-06-14 21:17:20.000000000 +0000
@@ -687,75 +455,6 @@ Index: elfutils-0.148/libelf/common.h
687 : (sizeof (Var) == 4 \ 455 : (sizeof (Var) == 4 \
688 ? bswap_32 (Var) \ 456 ? bswap_32 (Var) \
689 : bswap_64 (Var)))) 457 : bswap_64 (Var))))
690Index: elfutils-0.148/libelf/Makefile.in
691===================================================================
692--- elfutils-0.148.orig/libelf/Makefile.in 2010-06-28 19:07:34.000000000 +0000
693+++ elfutils-0.148/libelf/Makefile.in 2010-07-03 13:04:07.000000000 +0000
694@@ -189,6 +189,7 @@
695 INSTALL_SCRIPT = @INSTALL_SCRIPT@
696 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
697 LDFLAGS = @LDFLAGS@
698+LD_AS_NEEDED = @LD_AS_NEEDED@
699 LEX = @LEX@
700 LEXLIB = @LEXLIB@
701 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
702@@ -218,6 +219,7 @@
703 STRIP = @STRIP@
704 USE_NLS = @USE_NLS@
705 VERSION = 1
706+WEXTRA = @WEXTRA@
707 XGETTEXT = @XGETTEXT@
708 XGETTEXT_015 = @XGETTEXT_015@
709 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
710@@ -279,7 +281,7 @@
711 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
712 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
713 $($(*F)_no_Werror),,-Werror) $(if \
714- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
715+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
716 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
717 $(am__append_1) $(am__append_2)
718 @MUDFLAP_FALSE@libmudflap =
719Index: elfutils-0.148/m4/Makefile.in
720===================================================================
721--- elfutils-0.148.orig/m4/Makefile.in 2010-06-28 19:07:34.000000000 +0000
722+++ elfutils-0.148/m4/Makefile.in 2010-07-03 13:04:07.000000000 +0000
723@@ -75,6 +75,7 @@
724 INSTALL_SCRIPT = @INSTALL_SCRIPT@
725 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
726 LDFLAGS = @LDFLAGS@
727+LD_AS_NEEDED = @LD_AS_NEEDED@
728 LEX = @LEX@
729 LEXLIB = @LEXLIB@
730 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
731@@ -104,6 +105,7 @@
732 STRIP = @STRIP@
733 USE_NLS = @USE_NLS@
734 VERSION = @VERSION@
735+WEXTRA = @WEXTRA@
736 XGETTEXT = @XGETTEXT@
737 XGETTEXT_015 = @XGETTEXT_015@
738 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
739Index: elfutils-0.148/Makefile.in
740===================================================================
741--- elfutils-0.148.orig/Makefile.in 2010-06-28 19:07:33.000000000 +0000
742+++ elfutils-0.148/Makefile.in 2010-07-03 13:04:07.000000000 +0000
743@@ -155,6 +155,7 @@
744 INSTALL_SCRIPT = @INSTALL_SCRIPT@
745 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
746 LDFLAGS = @LDFLAGS@
747+LD_AS_NEEDED = @LD_AS_NEEDED@
748 LEX = @LEX@
749 LEXLIB = @LEXLIB@
750 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
751@@ -184,6 +185,7 @@
752 STRIP = @STRIP@
753 USE_NLS = @USE_NLS@
754 VERSION = @VERSION@
755+WEXTRA = @WEXTRA@
756 XGETTEXT = @XGETTEXT@
757 XGETTEXT_015 = @XGETTEXT_015@
758 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
759Index: elfutils-0.148/src/addr2line.c 458Index: elfutils-0.148/src/addr2line.c
760=================================================================== 459===================================================================
761--- elfutils-0.148.orig/src/addr2line.c 2010-05-28 14:38:30.000000000 +0000 460--- elfutils-0.148.orig/src/addr2line.c 2010-05-28 14:38:30.000000000 +0000
@@ -908,45 +607,7 @@ Index: elfutils-0.148/src/Makefile.am
908 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl 607 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
909 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl 608 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
910 size_LDADD = $(libelf) $(libeu) $(libmudflap) 609 size_LDADD = $(libelf) $(libeu) $(libmudflap)
911Index: elfutils-0.148/src/Makefile.in 610
912===================================================================
913--- elfutils-0.148.orig/src/Makefile.in 2010-06-28 19:07:34.000000000 +0000
914+++ elfutils-0.148/src/Makefile.in 2010-07-03 13:04:08.000000000 +0000
915@@ -228,6 +228,7 @@
916 INSTALL_SCRIPT = @INSTALL_SCRIPT@
917 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
918 LDFLAGS = @LDFLAGS@
919+LD_AS_NEEDED = @LD_AS_NEEDED@
920 LEX = @LEX@
921 LEXLIB = @LEXLIB@
922 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
923@@ -257,6 +258,7 @@
924 STRIP = @STRIP@
925 USE_NLS = @USE_NLS@
926 VERSION = @VERSION@
927+WEXTRA = @WEXTRA@
928 XGETTEXT = @XGETTEXT@
929 XGETTEXT_015 = @XGETTEXT_015@
930 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
931@@ -321,7 +323,7 @@
932 -I$(srcdir)/../libasm
933 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
934 $($(*F)_no_Werror),,-Werror) $(if \
935- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
936+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
937 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
938 $(am__append_1)
939 @MUDFLAP_FALSE@libmudflap =
940@@ -368,6 +370,9 @@
941 addr2line_no_Wformat = yes
942 # XXX While the file is not finished, don't warn about this
943 ldgeneric_no_Wunused = yes
944+
945+# Buggy old compilers.
946+readelf_no_Werror = yes
947 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
948 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
949 size_LDADD = $(libelf) $(libeu) $(libmudflap)
950Index: elfutils-0.148/src/readelf.c 611Index: elfutils-0.148/src/readelf.c
951=================================================================== 612===================================================================
952--- elfutils-0.148.orig/src/readelf.c 2010-06-28 19:05:56.000000000 +0000 613--- elfutils-0.148.orig/src/readelf.c 2010-06-28 19:05:56.000000000 +0000
@@ -1093,32 +754,3 @@ Index: elfutils-0.148/tests/line2addr.c
1093 { 754 {
1094 default: 755 default:
1095 case 0: 756 case 0:
1096Index: elfutils-0.148/tests/Makefile.in
1097===================================================================
1098--- elfutils-0.148.orig/tests/Makefile.in 2010-06-28 19:07:34.000000000 +0000
1099+++ elfutils-0.148/tests/Makefile.in 2010-07-03 13:04:08.000000000 +0000
1100@@ -372,6 +372,7 @@
1101 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1102 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1103 LDFLAGS = @LDFLAGS@
1104+LD_AS_NEEDED = @LD_AS_NEEDED@
1105 LEX = @LEX@
1106 LEXLIB = @LEXLIB@
1107 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1108@@ -401,6 +402,7 @@
1109 STRIP = @STRIP@
1110 USE_NLS = @USE_NLS@
1111 VERSION = @VERSION@
1112+WEXTRA = @WEXTRA@
1113 XGETTEXT = @XGETTEXT@
1114 XGETTEXT_015 = @XGETTEXT_015@
1115 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
1116@@ -462,7 +464,7 @@
1117 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
1118 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
1119 $($(*F)_no_Werror),,-Werror) $(if \
1120- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
1121+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
1122 $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
1123 $(am__append_1)
1124 @MUDFLAP_FALSE@libmudflap =
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 00:53:45 +0000