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.diff1124
1 files changed, 1124 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
new file mode 100644
index 0000000..4b3bd64
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff
@@ -0,0 +1,1124 @@
1Upstream-Status: Backport
2
3Index: elfutils-0.148/backends/ChangeLog
4===================================================================
5--- elfutils-0.148.orig/backends/ChangeLog 2010-04-13 20:08:02.000000000 +0000
6+++ elfutils-0.148/backends/ChangeLog 2010-07-03 13:04:07.000000000 +0000
7@@ -106,6 +106,10 @@
8 * ppc_attrs.c (ppc_check_object_attribute): Handle tag
9 GNU_Power_ABI_Struct_Return.
10
11+2009-01-23 Roland McGrath <roland@redhat.com>
12+
13+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
14+
15 2008-10-04 Ulrich Drepper <drepper@redhat.com>
16
17 * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
18@@ -433,6 +437,11 @@
19 * sparc_init.c: Likewise.
20 * x86_64_init.c: Likewise.
21
22+2005-11-22 Roland McGrath <roland@redhat.com>
23+
24+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
25+ (libebl_%.so rule): Use it in place of -Wl,--as-needed.
26+
27 2005-11-19 Roland McGrath <roland@redhat.com>
28
29 * ppc64_reloc.def: REL30 -> ADDR30.
30@@ -455,6 +464,9 @@
31 * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
32 (CLEANFILES): Add libebl_$(m).so.
33
34+ * Makefile.am (WEXTRA): New variable, substituted by configure.
35+ (AM_CFLAGS): Use it in place of -Wextra.
36+
37 * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
38 * ppc64_reloc.def: Likewise.
39
40Index: elfutils-0.148/backends/Makefile.am
41===================================================================
42--- elfutils-0.148.orig/backends/Makefile.am 2010-04-13 20:08:02.000000000 +0000
43+++ elfutils-0.148/backends/Makefile.am 2010-07-03 13:04:07.000000000 +0000
44@@ -103,7 +103,7 @@
45 $(LINK) -shared -o $(@:.map=.so) \
46 -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
47 -Wl,--version-script,$(@:.so=.map) \
48- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
49+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
50 $(textrel_check)
51
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
92===================================================================
93--- elfutils-0.148.orig/ChangeLog 2010-04-21 14:26:40.000000000 +0000
94+++ elfutils-0.148/ChangeLog 2010-07-03 13:04:07.000000000 +0000
95@@ -2,6 +2,10 @@
96
97 * configure.ac (LOCALEDIR, DATADIRNAME): Removed.
98
99+2009-11-22 Roland McGrath <roland@redhat.com>
100+
101+ * configure.ac: Use sed and expr instead of modern bash extensions.
102+
103 2009-09-21 Ulrich Drepper <drepper@redhat.com>
104
105 * configure.ac: Update for more modern autoconf.
106@@ -10,6 +14,10 @@
107
108 * configure.ac (zip_LIBS): Check for liblzma too.
109
110+2009-08-17 Roland McGrath <roland@redhat.com>
111+
112+ * configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
113+
114 2009-04-19 Roland McGrath <roland@redhat.com>
115
116 * configure.ac (eu_version): Round down here, not in version.h macros.
117@@ -21,6 +29,8 @@
118
119 2009-01-23 Roland McGrath <roland@redhat.com>
120
121+ * configure.ac: Check for __builtin_popcount.
122+
123 * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
124
125 * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
126@@ -101,6 +111,10 @@
127 * configure.ac: Add dummy automake conditional to get dependencies
128 for non-generic linker right. See src/Makefile.am.
129
130+2005-11-22 Roland McGrath <roland@redhat.com>
131+
132+ * configure.ac: Check for --as-needed linker option.
133+
134 2005-11-18 Roland McGrath <roland@redhat.com>
135
136 * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
137@@ -148,6 +162,17 @@
138 * Makefile.am (all_SUBDIRS): Add libdwfl.
139 * configure.ac: Write libdwfl/Makefile.
140
141+2005-05-31 Roland McGrath <roland@redhat.com>
142+
143+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
144+
145+ * configure.ac: Check for struct stat st_?tim members.
146+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.
147+
148+ * configure.ac: Check for futimes function.
149+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
150+ (handle_ar) [! HAVE_FUTIMES]: Likewise.
151+
152 2005-05-19 Roland McGrath <roland@redhat.com>
153
154 * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
155Index: elfutils-0.148/config/eu.am
156===================================================================
157--- elfutils-0.148.orig/config/eu.am 2010-04-21 14:26:40.000000000 +0000
158+++ elfutils-0.148/config/eu.am 2010-07-03 13:04:07.000000000 +0000
159@@ -25,11 +25,14 @@
160 ## <http://www.openinventionnetwork.com>.
161 ##
162
163+WEXTRA = @WEXTRA@
164+LD_AS_NEEDED = @LD_AS_NEEDED@
165+
166 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
167 INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
168 AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
169 $(if $($(*F)_no_Werror),,-Werror) \
170- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
171+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
172 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
173 $($(*F)_CFLAGS)
174
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
196===================================================================
197--- elfutils-0.148.orig/config.h.in 2010-06-28 19:07:37.000000000 +0000
198+++ elfutils-0.148/config.h.in 2010-07-03 13:04:07.000000000 +0000
199@@ -1,5 +1,8 @@
200 /* config.h.in. Generated from configure.ac by autoheader. */
201
202+/* Have __builtin_popcount. */
203+#undef HAVE_BUILTIN_POPCOUNT
204+
205 /* $libdir subdirectory containing libebl modules. */
206 #undef LIBEBL_SUBDIR
207
208@@ -55,4 +58,7 @@
209 /* Define for large files, on AIX-style hosts. */
210 #undef _LARGE_FILES
211
212+/* Stubbed out if missing compiler support. */
213+#undef __thread
214+
215 #include <eu-config.h>
216Index: elfutils-0.148/configure.ac
217===================================================================
218--- elfutils-0.148.orig/configure.ac 2010-06-28 19:07:26.000000000 +0000
219+++ elfutils-0.148/configure.ac 2010-07-03 13:04:07.000000000 +0000
220@@ -73,6 +73,54 @@
221 AS_IF([test "x$ac_cv_c99" != xyes],
222 AC_MSG_ERROR([gcc with C99 support required]))
223
224+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
225+old_CFLAGS="$CFLAGS"
226+CFLAGS="$CFLAGS -Wextra"
227+AC_COMPILE_IFELSE([void foo (void) { }],
228+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
229+CFLAGS="$old_CFLAGS"])
230+AC_SUBST(WEXTRA)
231+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
232+
233+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
234+old_CFLAGS="$CFLAGS"
235+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
236+AC_COMPILE_IFELSE([
237+void foo (void)
238+{
239+ inline void bar (void) {}
240+ bar ();
241+}
242+extern inline void baz (void) {}
243+], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
244+CFLAGS="$old_CFLAGS"])
245+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
246+ [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
247+
248+AC_CACHE_CHECK([for --as-needed linker option],
249+ ac_cv_as_needed, [dnl
250+cat > conftest.c <<EOF
251+int main (void) { return 0; }
252+EOF
253+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
254+ -fPIC -shared -o conftest.so conftest.c
255+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
256+then
257+ ac_cv_as_needed=yes
258+else
259+ ac_cv_as_needed=no
260+fi
261+rm -f conftest*])
262+AS_IF([test "x$ac_cv_as_needed" = xyes],
263+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
264+AC_SUBST(LD_AS_NEEDED)
265+
266+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
267+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
268+ ac_cv_popcount=yes, ac_cv_popcount=no)])
269+AS_IF([test "x$ac_cv_popcount" = xyes],
270+ [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
271+
272 AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
273 # Use the same flags that we use for our DSOs, so the test is representative.
274 # Some old compiler/linker/libc combinations fail some ways and not others.
275@@ -88,7 +136,10 @@
276 CFLAGS="$save_CFLAGS"
277 LDFLAGS="$save_LDFLAGS"])
278 AS_IF([test "x$ac_cv_tls" != xyes],
279- AC_MSG_ERROR([__thread support required]))
280+ [AS_IF([test "$use_locks" = yes],
281+ [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
282+ [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
283+ [Stubbed out if missing compiler support.])])])
284
285 dnl This test must come as early as possible after the compiler configuration
286 dnl tests, because the choice of the file model can (in principle) affect
287@@ -251,7 +302,7 @@
288
289 # 1.234<whatever> -> 1234<whatever>
290 case "$PACKAGE_VERSION" in
291-[[0-9]].*) eu_version="${PACKAGE_VERSION/./}" ;;
292+[[0-9]].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;;
293 *) AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;;
294 esac
295 case "$eu_version" in
296@@ -280,6 +331,6 @@
297 esac
298
299 # Round up to the next release API (x.y) version.
300-[eu_version=$[($eu_version + 999) / 1000]]
301+eu_version=`expr \( $eu_version + 999 \) / 1000`
302
303 AC_OUTPUT
304Index: elfutils-0.148/lib/ChangeLog
305===================================================================
306--- elfutils-0.148.orig/lib/ChangeLog 2010-06-28 19:05:56.000000000 +0000
307+++ elfutils-0.148/lib/ChangeLog 2010-07-03 13:04:07.000000000 +0000
308@@ -14,6 +14,9 @@
309
310 2009-01-23 Roland McGrath <roland@redhat.com>
311
312+ * eu-config.h [! HAVE_BUILTIN_POPCOUNT]
313+ (__builtin_popcount): New inline function.
314+
315 * eu-config.h: Add multiple inclusion protection.
316
317 2009-01-17 Ulrich Drepper <drepper@redhat.com>
318@@ -70,6 +73,11 @@
319 * Makefile.am (libeu_a_SOURCES): Add it.
320 * system.h: Declare crc32_file.
321
322+2005-02-07 Roland McGrath <roland@redhat.com>
323+
324+ * Makefile.am (WEXTRA): New variable, substituted by configure.
325+ (AM_CFLAGS): Use it in place of -Wextra.
326+
327 2005-04-30 Ulrich Drepper <drepper@redhat.com>
328
329 * Makefile.am: Use -ffunction-sections for xmalloc.c.
330Index: elfutils-0.148/lib/eu-config.h
331===================================================================
332--- elfutils-0.148.orig/lib/eu-config.h 2009-08-12 14:23:22.000000000 +0000
333+++ elfutils-0.148/lib/eu-config.h 2010-07-03 13:04:07.000000000 +0000
334@@ -182,6 +182,17 @@
335 /* This macro is used by the tests conditionalize for standalone building. */
336 #define ELFUTILS_HEADER(name) <lib##name.h>
337
338+#ifndef HAVE_BUILTIN_POPCOUNT
339+# define __builtin_popcount hakmem_popcount
340+static inline unsigned int __attribute__ ((unused))
341+hakmem_popcount (unsigned int x)
342+{
343+ /* HAKMEM 169 */
344+ unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
345+ return ((n + (n >> 3)) & 030707070707) % 63;
346+}
347+#endif /* HAVE_BUILTIN_POPCOUNT */
348+
349
350 #ifdef SHARED
351 # 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
382===================================================================
383--- elfutils-0.148.orig/libasm/ChangeLog 2010-03-05 05:48:23.000000000 +0000
384+++ elfutils-0.148/libasm/ChangeLog 2010-07-03 13:04:07.000000000 +0000
385@@ -67,6 +67,11 @@
386 * asm_error.c: Add new error ASM_E_IOERROR.
387 * libasmP.h: Add ASM_E_IOERROR definition.
388
389+2005-05-31 Roland McGrath <roland@redhat.com>
390+
391+ * Makefile.am (WEXTRA): New variable, substituted by configure.
392+ (AM_CFLAGS): Use it in place of -Wextra.
393+
394 2005-02-15 Ulrich Drepper <drepper@redhat.com>
395
396 * 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
427===================================================================
428--- elfutils-0.148.orig/libcpu/ChangeLog 2010-03-05 05:48:23.000000000 +0000
429+++ elfutils-0.148/libcpu/ChangeLog 2010-07-03 13:04:07.000000000 +0000
430@@ -9,6 +9,9 @@
431
432 2009-01-23 Roland McGrath <roland@redhat.com>
433
434+ * i386_disasm.c (i386_disasm): Add abort after assert-constant for old
435+ compilers that don't realize it's noreturn.
436+
437 * Makefile.am (i386_parse_CFLAGS): Use quotes around command
438 substitution that can produce leading whitespace.
439
440@@ -338,6 +341,11 @@
441 * defs/i386.doc: New file.
442 * defs/x86_64: New file.
443
444+2005-04-04 Roland McGrath <roland@redhat.com>
445+
446+ * Makefile.am (WEXTRA): New variable, substituted by configure.
447+ (AM_CFLAGS): Use it instead of -Wextra.
448+
449 2005-02-15 Ulrich Drepper <drepper@redhat.com>
450
451 * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
452Index: elfutils-0.148/libcpu/i386_disasm.c
453===================================================================
454--- elfutils-0.148.orig/libcpu/i386_disasm.c 2009-01-08 20:56:36.000000000 +0000
455+++ elfutils-0.148/libcpu/i386_disasm.c 2010-07-03 13:04:07.000000000 +0000
456@@ -791,6 +791,7 @@
457
458 default:
459 assert (! "INVALID not handled");
460+ abort ();
461 }
462 }
463 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
494===================================================================
495--- elfutils-0.148.orig/libdw/ChangeLog 2010-06-28 19:05:56.000000000 +0000
496+++ elfutils-0.148/libdw/ChangeLog 2010-07-03 13:04:07.000000000 +0000
497@@ -276,6 +276,10 @@
498
499 * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
500
501+2009-08-17 Roland McGrath <roland@redhat.com>
502+
503+ * libdw.h: Disable extern inlines for GCC 4.2.
504+
505 2009-08-10 Roland McGrath <roland@redhat.com>
506
507 * dwarf_getscopevar.c: Use dwarf_diename.
508@@ -1044,6 +1048,11 @@
509
510 2005-05-31 Roland McGrath <roland@redhat.com>
511
512+ * Makefile.am (WEXTRA): New variable, substituted by configure.
513+ (AM_CFLAGS): Use it in place of -Wextra.
514+
515+2005-05-31 Roland McGrath <roland@redhat.com>
516+
517 * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
518 formref offset.
519
520Index: elfutils-0.148/libdw/libdw.h
521===================================================================
522--- elfutils-0.148.orig/libdw/libdw.h 2010-06-28 19:05:56.000000000 +0000
523+++ elfutils-0.148/libdw/libdw.h 2010-07-03 13:04:07.000000000 +0000
524@@ -842,7 +842,7 @@
525
526
527 /* Inline optimizations. */
528-#ifdef __OPTIMIZE__
529+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
530 /* Return attribute code of given attribute. */
531 __libdw_extern_inline unsigned int
532 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
563===================================================================
564--- elfutils-0.148.orig/libdwfl/ChangeLog 2010-06-28 19:05:56.000000000 +0000
565+++ elfutils-0.148/libdwfl/ChangeLog 2010-07-03 13:04:07.000000000 +0000
566@@ -1265,6 +1265,11 @@
567
568 2005-07-21 Roland McGrath <roland@redhat.com>
569
570+ * Makefile.am (WEXTRA): New variable, substituted by configure.
571+ (AM_CFLAGS): Use it in place of -Wextra.
572+
573+2005-07-21 Roland McGrath <roland@redhat.com>
574+
575 * Makefile.am (noinst_HEADERS): Add loc2c.c.
576
577 * 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
608===================================================================
609--- elfutils-0.148.orig/libebl/ChangeLog 2010-03-05 05:48:23.000000000 +0000
610+++ elfutils-0.148/libebl/ChangeLog 2010-07-03 13:04:07.000000000 +0000
611@@ -624,6 +624,11 @@
612 * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
613 tracking works right.
614
615+2005-05-31 Roland McGrath <roland@redhat.com>
616+
617+ * Makefile.am (WEXTRA): New variable, substituted by configure.
618+ (AM_CFLAGS): Use it in place of -Wextra.
619+
620 2005-05-21 Ulrich Drepper <drepper@redhat.com>
621
622 * 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
653===================================================================
654--- elfutils-0.148.orig/libelf/ChangeLog 2010-06-14 21:17:20.000000000 +0000
655+++ elfutils-0.148/libelf/ChangeLog 2010-07-03 13:04:07.000000000 +0000
656@@ -657,6 +657,11 @@
657
658 * elf.h: Update from glibc.
659
660+2005-05-31 Roland McGrath <roland@redhat.com>
661+
662+ * Makefile.am (WEXTRA): New variable, substituted by configure.
663+ (AM_CFLAGS): Use it in place of -Wextra.
664+
665 2005-05-08 Roland McGrath <roland@redhat.com>
666
667 * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
668Index: elfutils-0.148/libelf/common.h
669===================================================================
670--- elfutils-0.148.orig/libelf/common.h 2009-01-08 20:56:36.000000000 +0000
671+++ elfutils-0.148/libelf/common.h 2010-07-03 13:04:07.000000000 +0000
672@@ -160,7 +160,7 @@
673 (Var) = (sizeof (Var) == 1 \
674 ? (unsigned char) (Var) \
675 : (sizeof (Var) == 2 \
676- ? bswap_16 (Var) \
677+ ? (unsigned short int) bswap_16 (Var) \
678 : (sizeof (Var) == 4 \
679 ? bswap_32 (Var) \
680 : bswap_64 (Var))))
681@@ -169,7 +169,7 @@
682 (Dst) = (sizeof (Var) == 1 \
683 ? (unsigned char) (Var) \
684 : (sizeof (Var) == 2 \
685- ? bswap_16 (Var) \
686+ ? (unsigned short int) bswap_16 (Var) \
687 : (sizeof (Var) == 4 \
688 ? bswap_32 (Var) \
689 : 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
760===================================================================
761--- elfutils-0.148.orig/src/addr2line.c 2010-05-28 14:38:30.000000000 +0000
762+++ elfutils-0.148/src/addr2line.c 2010-07-03 13:05:40.000000000 +0000
763@@ -447,10 +447,10 @@
764 bool parsed = false;
765 int i, j;
766 char *name = NULL;
767- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
768+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
769 && string[i] == '\0')
770 parsed = adjust_to_section (name, &addr, dwfl);
771- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
772+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
773 {
774 default:
775 break;
776Index: elfutils-0.148/src/ChangeLog
777===================================================================
778--- elfutils-0.148.orig/src/ChangeLog 2010-06-28 19:05:56.000000000 +0000
779+++ elfutils-0.148/src/ChangeLog 2010-07-03 13:04:08.000000000 +0000
780@@ -165,8 +165,16 @@
781 * readelf.c (attr_callback): Use print_block only when we don't use
782 print_ops.
783
784+2009-08-17 Roland McGrath <roland@redhat.com>
785+
786+ * ld.h: Disable extern inlines for GCC 4.2.
787+
788 2009-08-14 Roland McGrath <roland@redhat.com>
789
790+ * strings.c (read_block): Conditionalize posix_fadvise use
791+ on [POSIX_FADV_SEQUENTIAL].
792+ From Petr Salinger <Petr.Salinger@seznam.cz>.
793+
794 * ar.c (do_oper_extract): Use pathconf instead of statfs.
795
796 2009-08-01 Ulrich Drepper <drepper@redhat.com>
797@@ -330,6 +338,8 @@
798 * readelf.c (print_debug_frame_section): Use t instead of j formats
799 for ptrdiff_t OFFSET.
800
801+ * addr2line.c (handle_address): Use %a instead of %m for compatibility.
802+
803 2009-01-21 Ulrich Drepper <drepper@redhat.com>
804
805 * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
806@@ -513,6 +523,11 @@
807 that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really
808 is valid in RELRO.
809
810+2008-03-01 Roland McGrath <roland@redhat.com>
811+
812+ * readelf.c (dump_archive_index): Tweak portability hack
813+ to match [__GNUC__ < 4] too.
814+
815 2008-02-29 Roland McGrath <roland@redhat.com>
816
817 * readelf.c (print_attributes): Add a cast.
818@@ -764,6 +779,8 @@
819
820 * readelf.c (hex_dump): Fix rounding error in whitespace calculation.
821
822+ * Makefile.am (readelf_no_Werror): New variable.
823+
824 2007-10-15 Roland McGrath <roland@redhat.com>
825
826 * make-debug-archive.in: New file.
827@@ -1203,6 +1220,10 @@
828 * elflint.c (valid_e_machine): Add EM_ALPHA.
829 Reported by Christian Aichinger <Greek0@gmx.net>.
830
831+ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
832+ MADV_SEQUENTIAL if undefined. Don't call posix_madvise
833+ if neither is defined.
834+
835 2006-08-08 Ulrich Drepper <drepper@redhat.com>
836
837 * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
838@@ -1279,6 +1300,10 @@
839 * Makefile.am: Add hacks to create dependency files for non-generic
840 linker.
841
842+2006-04-05 Roland McGrath <roland@redhat.com>
843+
844+ * strings.c (MAP_POPULATE): Define to 0 if undefined.
845+
846 2006-06-12 Ulrich Drepper <drepper@redhat.com>
847
848 * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
849@@ -1627,6 +1652,11 @@
850 * readelf.c (print_debug_loc_section): Fix indentation for larger
851 address size.
852
853+2005-05-31 Roland McGrath <roland@redhat.com>
854+
855+ * Makefile.am (WEXTRA): New variable, substituted by configure.
856+ (AM_CFLAGS): Use it in place of -Wextra.
857+
858 2005-05-30 Roland McGrath <roland@redhat.com>
859
860 * readelf.c (print_debug_line_section): Print section offset of each
861Index: elfutils-0.148/src/findtextrel.c
862===================================================================
863--- elfutils-0.148.orig/src/findtextrel.c 2009-02-11 01:12:59.000000000 +0000
864+++ elfutils-0.148/src/findtextrel.c 2010-07-03 13:04:08.000000000 +0000
865@@ -490,7 +490,11 @@
866
867
868 static void
869-check_rel (size_t nsegments, struct segments segments[nsegments],
870+check_rel (size_t nsegments, struct segments segments[
871+#if __GNUC__ >= 4
872+ nsegments
873+#endif
874+ ],
875 GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
876 const char *fname, bool more_than_one, void **knownsrcs)
877 {
878Index: elfutils-0.148/src/ld.h
879===================================================================
880--- elfutils-0.148.orig/src/ld.h 2009-06-13 22:39:51.000000000 +0000
881+++ elfutils-0.148/src/ld.h 2010-07-03 13:04:08.000000000 +0000
882@@ -1122,6 +1122,7 @@
883
884 /* Checked whether the symbol is undefined and referenced from a DSO. */
885 extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
886+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
887 #ifdef __GNUC_STDC_INLINE__
888 __attribute__ ((__gnu_inline__))
889 #endif
890@@ -1139,5 +1140,6 @@
891
892 return sym->defined && sym->in_dso;
893 }
894+#endif /* Optimizing and not GCC 4.2. */
895
896 #endif /* ld.h */
897Index: elfutils-0.148/src/Makefile.am
898===================================================================
899--- elfutils-0.148.orig/src/Makefile.am 2010-03-05 05:48:23.000000000 +0000
900+++ elfutils-0.148/src/Makefile.am 2010-07-03 13:04:08.000000000 +0000
901@@ -99,6 +99,9 @@
902 # XXX While the file is not finished, don't warn about this
903 ldgeneric_no_Wunused = yes
904
905+# Buggy old compilers.
906+readelf_no_Werror = yes
907+
908 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
909 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
910 size_LDADD = $(libelf) $(libeu) $(libmudflap)
911Index: elfutils-0.148/src/Makefile.in
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
951===================================================================
952--- elfutils-0.148.orig/src/readelf.c 2010-06-28 19:05:56.000000000 +0000
953+++ elfutils-0.148/src/readelf.c 2010-07-03 13:04:08.000000000 +0000
954@@ -7845,7 +7845,7 @@
955 if (unlikely (elf_rand (elf, as_off) == 0)
956 || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
957 == NULL))
958-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
959+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4
960 while (1)
961 #endif
962 error (EXIT_FAILURE, 0,
963Index: elfutils-0.148/src/strings.c
964===================================================================
965--- elfutils-0.148.orig/src/strings.c 2009-02-11 01:12:59.000000000 +0000
966+++ elfutils-0.148/src/strings.c 2010-07-03 13:04:08.000000000 +0000
967@@ -51,6 +51,10 @@
968
969 #include <system.h>
970
971+#ifndef MAP_POPULATE
972+# define MAP_POPULATE 0
973+#endif
974+
975
976 /* Prototypes of local functions. */
977 static int read_fd (int fd, const char *fname, off64_t fdlen);
978@@ -491,8 +495,13 @@
979 fd, start_off);
980 if (mem != MAP_FAILED)
981 {
982+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
983+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
984+#endif
985+#ifdef POSIX_MADV_SEQUENTIAL
986 /* We will go through the mapping sequentially. */
987 (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
988+#endif
989 break;
990 }
991 if (errno != EINVAL && errno != ENOMEM)
992@@ -586,9 +595,11 @@
993 elfmap_off = from & ~(ps - 1);
994 elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
995
996+#ifdef POSIX_FADV_SEQUENTIAL
997 if (unlikely (elfmap == MAP_FAILED))
998 /* Let the kernel know we are going to read everything in sequence. */
999 (void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
1000+#endif
1001 }
1002
1003 if (unlikely (elfmap == MAP_FAILED))
1004Index: elfutils-0.148/src/strip.c
1005===================================================================
1006--- elfutils-0.148.orig/src/strip.c 2010-01-15 09:05:55.000000000 +0000
1007+++ elfutils-0.148/src/strip.c 2010-07-03 13:04:08.000000000 +0000
1008@@ -53,6 +53,12 @@
1009 #include <libebl.h>
1010 #include <system.h>
1011
1012+#ifdef HAVE_FUTIMES
1013+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
1014+#else
1015+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
1016+#endif
1017+
1018
1019 /* Name and version of program. */
1020 static void print_version (FILE *stream, struct argp_state *state);
1021@@ -301,8 +307,18 @@
1022
1023 /* If we have to preserve the timestamp, we need it in the
1024 format utimes() understands. */
1025+#ifdef HAVE_STRUCT_STAT_ST_ATIM
1026 TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
1027+#else
1028+ tv[0].tv_sec = pre_st.st_atime;
1029+ tv[0].tv_usec = 0;
1030+#endif
1031+#ifdef HAVE_STRUCT_STAT_ST_MTIM
1032 TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
1033+#else
1034+ tv[1].tv_sec = pre_st.st_atime;
1035+ tv[1].tv_usec = 0;
1036+#endif
1037 }
1038
1039 /* Open the file. */
1040@@ -1747,7 +1763,7 @@
1041 /* If requested, preserve the timestamp. */
1042 if (tvp != NULL)
1043 {
1044- if (futimes (fd, tvp) != 0)
1045+ if (FUTIMES (fd, output_fname, tvp) != 0)
1046 {
1047 error (0, errno, gettext ("\
1048 cannot set access and modification date of '%s'"),
1049@@ -1804,7 +1820,7 @@
1050
1051 if (tvp != NULL)
1052 {
1053- if (unlikely (futimes (fd, tvp) != 0))
1054+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
1055 {
1056 error (0, errno, gettext ("\
1057 cannot set access and modification date of '%s'"), fname);
1058Index: elfutils-0.148/tests/ChangeLog
1059===================================================================
1060--- elfutils-0.148.orig/tests/ChangeLog 2010-06-28 19:05:56.000000000 +0000
1061+++ elfutils-0.148/tests/ChangeLog 2010-07-03 13:04:08.000000000 +0000
1062@@ -154,6 +154,8 @@
1063
1064 2008-01-21 Roland McGrath <roland@redhat.com>
1065
1066+ * line2addr.c (main): Revert last change.
1067+
1068 * testfile45.S.bz2: Add tests for cltq, cqto.
1069 * testfile45.expect.bz2: Adjust.
1070
1071@@ -862,6 +864,11 @@
1072 * Makefile.am (TESTS): Add run-elflint-test.sh.
1073 (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
1074
1075+2005-05-31 Roland McGrath <roland@redhat.com>
1076+
1077+ * Makefile.am (WEXTRA): New variable, substituted by configure.
1078+ (AM_CFLAGS): Use it in place of -Wextra.
1079+
1080 2005-05-24 Ulrich Drepper <drepper@redhat.com>
1081
1082 * get-files.c (main): Use correct format specifier.
1083Index: elfutils-0.148/tests/line2addr.c
1084===================================================================
1085--- elfutils-0.148.orig/tests/line2addr.c 2009-01-08 20:56:37.000000000 +0000
1086+++ elfutils-0.148/tests/line2addr.c 2010-07-03 13:04:08.000000000 +0000
1087@@ -132,7 +132,7 @@
1088 {
1089 struct args a = { .arg = argv[cnt] };
1090
1091- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
1092+ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
1093 {
1094 default:
1095 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 =