summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff370
1 files changed, 1 insertions, 369 deletions
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 =