Magellan Linux

Annotation of /trunk/elfutils/patches/elfutils-0.131-portability.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 573 - (hide annotations) (download)
Sun Apr 20 23:45:45 2008 UTC (16 years, 2 months ago) by niro
File size: 34521 byte(s)
-re-diffed

1 niro 573 --- elfutils/backends/ChangeLog
2     +++ elfutils/backends/ChangeLog
3     @@ -240,6 +240,11 @@
4     * sparc_init.c: Likewise.
5     * x86_64_init.c: Likewise.
6    
7     +2005-11-22 Roland McGrath <roland@redhat.com>
8     +
9     + * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
10     + (libebl_%.so rule): Use it in place of -Wl,--as-needed.
11     +
12     2005-11-19 Roland McGrath <roland@redhat.com>
13    
14     * ppc64_reloc.def: REL30 -> ADDR30.
15     @@ -262,6 +267,9 @@
16     * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
17     (CLEANFILES): Add libebl_$(m).so.
18    
19     + * Makefile.am (WEXTRA): New variable, substituted by configure.
20     + (AM_CFLAGS): Use it in place of -Wextra.
21     +
22     * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
23     * ppc64_reloc.def: Likewise.
24    
25     --- elfutils/backends/Makefile.am
26     +++ elfutils/backends/Makefile.am
27     @@ -25,12 +25,14 @@
28     ## <http://www.openinventionnetwork.com>.
29     ##
30     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
31     +WEXTRA = @WEXTRA@
32     +LD_AS_NEEDED = @LD_AS_NEEDED@
33     if MUDFLAP
34     AM_CFLAGS = -fmudflap
35     else
36     AM_CFLAGS =
37     endif
38     -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
39     +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
40     -std=gnu99
41     INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
42     -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
43     @@ -62,7 +64,7 @@ textrel_check = if readelf -d $@ | fgrep
44     libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
45     $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
46     -Wl,--version-script,$(word 2,$^) \
47     - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
48     + -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
49     $(textrel_check)
50    
51     libebl_%.map: Makefile
52     --- elfutils/backends/Makefile.in
53     +++ elfutils/backends/Makefile.in
54     @@ -152,6 +152,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
55     INSTALL_SCRIPT = @INSTALL_SCRIPT@
56     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
57     LDFLAGS = @LDFLAGS@
58     +LD_AS_NEEDED = @LD_AS_NEEDED@
59     LEX = @LEX@
60     LEXLIB = @LEXLIB@
61     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
62     @@ -181,6 +182,7 @@ SHELL = @SHELL@
63     STRIP = @STRIP@
64     USE_NLS = @USE_NLS@
65     VERSION = @VERSION@
66     +WEXTRA = @WEXTRA@
67     XGETTEXT = @XGETTEXT@
68     XGETTEXT_015 = @XGETTEXT_015@
69     YACC = @YACC@
70     @@ -236,9 +238,9 @@ target_alias = @target_alias@
71     top_builddir = @top_builddir@
72     top_srcdir = @top_srcdir@
73     @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
74     -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
75     +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
76     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
77     -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
78     +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
79     INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
80     -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
81     -I$(top_srcdir)/lib -I..
82     @@ -626,7 +628,7 @@ uninstall-am:
83     libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
84     $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
85     -Wl,--version-script,$(word 2,$^) \
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_%.map: Makefile
91     --- elfutils/ChangeLog
92     +++ elfutils/ChangeLog
93     @@ -25,6 +25,10 @@
94     * configure.ac: Add dummy automake conditional to get dependencies
95     for non-generic linker right. See src/Makefile.am.
96    
97     +2005-11-22 Roland McGrath <roland@redhat.com>
98     +
99     + * configure.ac: Check for --as-needed linker option.
100     +
101     2005-11-18 Roland McGrath <roland@redhat.com>
102    
103     * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
104     @@ -72,6 +76,17 @@
105     * Makefile.am (all_SUBDIRS): Add libdwfl.
106     * configure.ac: Write libdwfl/Makefile.
107    
108     +2005-05-31 Roland McGrath <roland@redhat.com>
109     +
110     + * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
111     +
112     + * configure.ac: Check for struct stat st_?tim members.
113     + * src/strip.c (process_file): Use st_?time if st_?tim are not there.
114     +
115     + * configure.ac: Check for futimes function.
116     + * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
117     + (handle_ar) [! HAVE_FUTIMES]: Likewise.
118     +
119     2005-05-19 Roland McGrath <roland@redhat.com>
120    
121     * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
122     --- elfutils/config/Makefile.in
123     +++ elfutils/config/Makefile.in
124     @@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
125     INSTALL_SCRIPT = @INSTALL_SCRIPT@
126     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
127     LDFLAGS = @LDFLAGS@
128     +LD_AS_NEEDED = @LD_AS_NEEDED@
129     LEX = @LEX@
130     LEXLIB = @LEXLIB@
131     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
132     @@ -100,6 +101,7 @@ SHELL = @SHELL@
133     STRIP = @STRIP@
134     USE_NLS = @USE_NLS@
135     VERSION = @VERSION@
136     +WEXTRA = @WEXTRA@
137     XGETTEXT = @XGETTEXT@
138     XGETTEXT_015 = @XGETTEXT_015@
139     YACC = @YACC@
140     --- elfutils/configure
141     +++ elfutils/configure
142     @@ -674,6 +674,8 @@ YFLAGS
143     LEX
144     LEX_OUTPUT_ROOT
145     LEXLIB
146     +WEXTRA
147     +LD_AS_NEEDED
148     LOCALEDIR
149     DATADIRNAME
150     NATIVE_LD_TRUE
151     @@ -3874,6 +3876,88 @@ echo "$as_me: error: gcc with C99 suppor
152     fi
153    
154    
155     +{ echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
156     +echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6; }
157     +if test "${ac_cv_cc_wextra+set}" = set; then
158     + echo $ECHO_N "(cached) $ECHO_C" >&6
159     +else
160     + old_CFLAGS="$CFLAGS"
161     +CFLAGS="$CFLAGS -Wextra"
162     +cat >conftest.$ac_ext <<_ACEOF
163     +void foo (void) { }
164     +_ACEOF
165     +rm -f conftest.$ac_objext
166     +if { (ac_try="$ac_compile"
167     +case "(($ac_try" in
168     + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
169     + *) ac_try_echo=$ac_try;;
170     +esac
171     +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
172     + (eval "$ac_compile") 2>conftest.er1
173     + ac_status=$?
174     + grep -v '^ *+' conftest.er1 >conftest.err
175     + rm -f conftest.er1
176     + cat conftest.err >&5
177     + echo "$as_me:$LINENO: \$? = $ac_status" >&5
178     + (exit $ac_status); } && {
179     + test -z "$ac_c_werror_flag" ||
180     + test ! -s conftest.err
181     + } && test -s conftest.$ac_objext; then
182     + ac_cv_cc_wextra=yes
183     +else
184     + echo "$as_me: failed program was:" >&5
185     +sed 's/^/| /' conftest.$ac_ext >&5
186     +
187     + ac_cv_cc_wextra=no
188     +fi
189     +
190     +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
191     +CFLAGS="$old_CFLAGS"
192     +fi
193     +{ echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
194     +echo "${ECHO_T}$ac_cv_cc_wextra" >&6; }
195     +
196     +if test "x$ac_cv_cc_wextra" = xyes; then
197     + WEXTRA=-Wextra
198     +else
199     + WEXTRA=-W
200     +fi
201     +
202     +
203     +{ echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
204     +echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6; }
205     +if test "${ac_cv_as_needed+set}" = set; then
206     + echo $ECHO_N "(cached) $ECHO_C" >&6
207     +else
208     + cat > conftest.c <<EOF
209     +int main (void) { return 0; }
210     +EOF
211     +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
212     + -fPIC -shared -o conftest.so conftest.c
213     + -Wl,--as-needed 1>&5'
214     + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
215     + (eval $ac_try) 2>&5
216     + ac_status=$?
217     + echo "$as_me:$LINENO: \$? = $ac_status" >&5
218     + (exit $ac_status); }; }
219     +then
220     + ac_cv_as_needed=yes
221     +else
222     + ac_cv_as_needed=no
223     +fi
224     +rm -f conftest*
225     +fi
226     +{ echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
227     +echo "${ECHO_T}$ac_cv_as_needed" >&6; }
228     +if test "x$ac_cv_as_needed" = xyes; then
229     + LD_AS_NEEDED=-Wl,--as-needed
230     +else
231     + LD_AS_NEEDED=
232     +fi
233     +
234     +
235     +
236     +
237     LOCALEDIR=$datadir
238    
239     cat >>confdefs.h <<_ACEOF
240     @@ -5608,10 +5692,10 @@ YFLAGS!$YFLAGS$ac_delim
241     LEX!$LEX$ac_delim
242     LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
243     LEXLIB!$LEXLIB$ac_delim
244     +WEXTRA!$WEXTRA$ac_delim
245     +LD_AS_NEEDED!$LD_AS_NEEDED$ac_delim
246     LOCALEDIR!$LOCALEDIR$ac_delim
247     DATADIRNAME!$DATADIRNAME$ac_delim
248     -NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
249     -NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
250     _ACEOF
251    
252     if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
253     @@ -5653,6 +5737,8 @@ _ACEOF
254     ac_delim='%!_!# '
255     for ac_last_try in false false false false false :; do
256     cat >conf$$subs.sed <<_ACEOF
257     +NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
258     +NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
259     base_cpu!$base_cpu$ac_delim
260     NEVER_TRUE!$NEVER_TRUE$ac_delim
261     NEVER_FALSE!$NEVER_FALSE$ac_delim
262     @@ -5683,7 +5769,7 @@ LIBOBJS!$LIBOBJS$ac_delim
263     LTLIBOBJS!$LTLIBOBJS$ac_delim
264     _ACEOF
265    
266     - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
267     + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
268     break
269     elif $ac_last_try; then
270     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
271     --- elfutils/configure.ac
272     +++ elfutils/configure.ac
273     @@ -71,6 +71,34 @@ CFLAGS="$old_CFLAGS"])
274     AS_IF([test "x$ac_cv_c99" != xyes],
275     AC_MSG_ERROR([gcc with C99 support required]))
276    
277     +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
278     +old_CFLAGS="$CFLAGS"
279     +CFLAGS="$CFLAGS -Wextra"
280     +AC_COMPILE_IFELSE([void foo (void) { }],
281     + ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
282     +CFLAGS="$old_CFLAGS"])
283     +AC_SUBST(WEXTRA)
284     +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
285     +
286     +AC_CACHE_CHECK([for --as-needed linker option],
287     + ac_cv_as_needed, [dnl
288     +cat > conftest.c <<EOF
289     +int main (void) { return 0; }
290     +EOF
291     +if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
292     + -fPIC -shared -o conftest.so conftest.c
293     + -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
294     +then
295     + ac_cv_as_needed=yes
296     +else
297     + ac_cv_as_needed=no
298     +fi
299     +rm -f conftest*])
300     +AS_IF([test "x$ac_cv_as_needed" = xyes],
301     + [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
302     +AC_SUBST(LD_AS_NEEDED)
303     +
304     +
305     LOCALEDIR=$datadir
306     AC_SUBST(LOCALEDIR)
307     AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
308     --- elfutils/lib/ChangeLog
309     +++ elfutils/lib/ChangeLog
310     @@ -16,6 +16,11 @@
311     * Makefile.am (libeu_a_SOURCES): Add it.
312     * system.h: Declare crc32_file.
313    
314     +2005-02-07 Roland McGrath <roland@redhat.com>
315     +
316     + * Makefile.am (WEXTRA): New variable, substituted by configure.
317     + (AM_CFLAGS): Use it in place of -Wextra.
318     +
319     2005-04-30 Ulrich Drepper <drepper@redhat.com>
320    
321     * Makefile.am: Use -ffunction-sections for xmalloc.c.
322     --- elfutils/lib/Makefile.am
323     +++ elfutils/lib/Makefile.am
324     @@ -25,12 +25,13 @@
325     ## <http://www.openinventionnetwork.com>.
326     ##
327     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
328     +WEXTRA = @WEXTRA@
329     if MUDFLAP
330     AM_CFLAGS = -fmudflap
331     else
332     AM_CFLAGS =
333     endif
334     -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
335     +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS)
336     INCLUDES = -I$(srcdir)/../libelf -I..
337    
338     noinst_LIBRARIES = libeu.a
339     --- elfutils/lib/Makefile.in
340     +++ elfutils/lib/Makefile.in
341     @@ -91,6 +91,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
342     INSTALL_SCRIPT = @INSTALL_SCRIPT@
343     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
344     LDFLAGS = @LDFLAGS@
345     +LD_AS_NEEDED = @LD_AS_NEEDED@
346     LEX = @LEX@
347     LEXLIB = @LEXLIB@
348     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
349     @@ -120,6 +121,7 @@ SHELL = @SHELL@
350     STRIP = @STRIP@
351     USE_NLS = @USE_NLS@
352     VERSION = @VERSION@
353     +WEXTRA = @WEXTRA@
354     XGETTEXT = @XGETTEXT@
355     XGETTEXT_015 = @XGETTEXT_015@
356     YACC = @YACC@
357     @@ -175,9 +177,9 @@ target_alias = @target_alias@
358     top_builddir = @top_builddir@
359     top_srcdir = @top_srcdir@
360     @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
361     -@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS)
362     +@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS)
363     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
364     -@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS)
365     +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS)
366     INCLUDES = -I$(srcdir)/../libelf -I..
367     noinst_LIBRARIES = libeu.a
368     libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
369     --- elfutils/libasm/ChangeLog
370     +++ elfutils/libasm/ChangeLog
371     @@ -32,6 +32,11 @@
372     * asm_error.c: Add new error ASM_E_IOERROR.
373     * libasmP.h: Add ASM_E_IOERROR definition.
374    
375     +2005-05-31 Roland McGrath <roland@redhat.com>
376     +
377     + * Makefile.am (WEXTRA): New variable, substituted by configure.
378     + (AM_CFLAGS): Use it in place of -Wextra.
379     +
380     2005-02-15 Ulrich Drepper <drepper@redhat.com>
381    
382     * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
383     --- elfutils/libasm/Makefile.am
384     +++ elfutils/libasm/Makefile.am
385     @@ -25,12 +25,13 @@
386     ## <http://www.openinventionnetwork.com>.
387     ##
388     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
389     +WEXTRA = @WEXTRA@
390     if MUDFLAP
391     AM_CFLAGS = -fmudflap
392     else
393     AM_CFLAGS =
394     endif
395     -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
396     +AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
397     INCLUDES = -I. -I$(srcdir) -I.. \
398     -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
399     -I$(top_srcdir)/lib
400     --- elfutils/libasm/Makefile.in
401     +++ elfutils/libasm/Makefile.in
402     @@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
403     INSTALL_SCRIPT = @INSTALL_SCRIPT@
404     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
405     LDFLAGS = @LDFLAGS@
406     +LD_AS_NEEDED = @LD_AS_NEEDED@
407     LEX = @LEX@
408     LEXLIB = @LEXLIB@
409     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
410     @@ -153,6 +154,7 @@ SHELL = @SHELL@
411     STRIP = @STRIP@
412     USE_NLS = @USE_NLS@
413     VERSION = 1
414     +WEXTRA = @WEXTRA@
415     XGETTEXT = @XGETTEXT@
416     XGETTEXT_015 = @XGETTEXT_015@
417     YACC = @YACC@
418     @@ -208,9 +210,9 @@ target_alias = @target_alias@
419     top_builddir = @top_builddir@
420     top_srcdir = @top_srcdir@
421     @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
422     -@MUDFLAP_FALSE@ -Wextra -Wformat=2
423     +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2
424     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
425     -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2
426     +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2
427     INCLUDES = -I. -I$(srcdir) -I.. \
428     -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
429     -I$(top_srcdir)/lib
430     --- elfutils/libcpu/ChangeLog
431     +++ elfutils/libcpu/ChangeLog
432     @@ -1,3 +1,8 @@
433     +2005-04-04 Roland McGrath <roland@redhat.com>
434     +
435     + * Makefile.am (WEXTRA): New variable, substituted by configure.
436     + (AM_CFLAGS): Use it instead of -Wextra.
437     +
438     2005-02-15 Ulrich Drepper <drepper@redhat.com>
439    
440     * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
441     --- elfutils/libcpu/Makefile.am
442     +++ elfutils/libcpu/Makefile.am
443     @@ -25,7 +25,8 @@
444     ## <http://www.openinventionnetwork.com>.
445     ##
446     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
447     -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
448     +WEXTRA = @WEXTRA@
449     +AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
450     INCLUDES = -I$(srcdir)
451    
452     noinst_LIBRARIES = libcpu_i386.a
453     --- elfutils/libcpu/Makefile.in
454     +++ elfutils/libcpu/Makefile.in
455     @@ -87,6 +87,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
456     INSTALL_SCRIPT = @INSTALL_SCRIPT@
457     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
458     LDFLAGS = @LDFLAGS@
459     +LD_AS_NEEDED = @LD_AS_NEEDED@
460     LEX = @LEX@
461     LEXLIB = @LEXLIB@
462     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
463     @@ -116,6 +117,7 @@ SHELL = @SHELL@
464     STRIP = @STRIP@
465     USE_NLS = @USE_NLS@
466     VERSION = @VERSION@
467     +WEXTRA = @WEXTRA@
468     XGETTEXT = @XGETTEXT@
469     XGETTEXT_015 = @XGETTEXT_015@
470     YACC = @YACC@
471     @@ -170,7 +172,7 @@ sysconfdir = @sysconfdir@
472     target_alias = @target_alias@
473     top_builddir = @top_builddir@
474     top_srcdir = @top_srcdir@
475     -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
476     +AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
477     INCLUDES = -I$(srcdir)
478     noinst_LIBRARIES = libcpu_i386.a
479     libcpu_i386_a_SOURCES = i386_dis.c
480     --- elfutils/libdw/ChangeLog
481     +++ elfutils/libdw/ChangeLog
482     @@ -425,6 +425,11 @@
483    
484     2005-05-31 Roland McGrath <roland@redhat.com>
485    
486     + * Makefile.am (WEXTRA): New variable, substituted by configure.
487     + (AM_CFLAGS): Use it in place of -Wextra.
488     +
489     +2005-05-31 Roland McGrath <roland@redhat.com>
490     +
491     * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
492     formref offset.
493    
494     --- elfutils/libdw/Makefile.am
495     +++ elfutils/libdw/Makefile.am
496     @@ -25,6 +25,7 @@
497     ## <http://www.openinventionnetwork.com>.
498     ##
499     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
500     +WEXTRA = @WEXTRA@
501     if MUDFLAP
502     AM_CFLAGS = -fmudflap
503     else
504     @@ -33,7 +34,7 @@ endif
505     if BUILD_STATIC
506     AM_CFLAGS += -fpic
507     endif
508     -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
509     +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
510     INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
511     VERSION = 1
512    
513     --- elfutils/libdw/Makefile.in
514     +++ elfutils/libdw/Makefile.in
515     @@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
516     INSTALL_SCRIPT = @INSTALL_SCRIPT@
517     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
518     LDFLAGS = @LDFLAGS@
519     +LD_AS_NEEDED = @LD_AS_NEEDED@
520     LEX = @LEX@
521     LEXLIB = @LEXLIB@
522     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
523     @@ -192,6 +193,7 @@ SHELL = @SHELL@
524     STRIP = @STRIP@
525     USE_NLS = @USE_NLS@
526     VERSION = 1
527     +WEXTRA = @WEXTRA@
528     XGETTEXT = @XGETTEXT@
529     XGETTEXT_015 = @XGETTEXT_015@
530     YACC = @YACC@
531     @@ -247,9 +249,10 @@ target_alias = @target_alias@
532     top_builddir = @top_builddir@
533     top_srcdir = @top_srcdir@
534     @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
535     -@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99
536     +@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
537     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \
538     -@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
539     +@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \
540     +@MUDFLAP_TRUE@ -std=gnu99
541     INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
542     COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
543     $(COMPILE)))
544     --- elfutils/libdwfl/ChangeLog
545     +++ elfutils/libdwfl/ChangeLog
546     @@ -739,6 +739,11 @@
547    
548     2005-07-21 Roland McGrath <roland@redhat.com>
549    
550     + * Makefile.am (WEXTRA): New variable, substituted by configure.
551     + (AM_CFLAGS): Use it in place of -Wextra.
552     +
553     +2005-07-21 Roland McGrath <roland@redhat.com>
554     +
555     * Makefile.am (noinst_HEADERS): Add loc2c.c.
556    
557     * test2.c (main): Check sscanf result to quiet warning.
558     --- elfutils/libdwfl/Makefile.am
559     +++ elfutils/libdwfl/Makefile.am
560     @@ -27,12 +27,13 @@
561     ## <http://www.openinventionnetwork.com>.
562     ##
563     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
564     +WEXTRA = @WEXTRA@
565     if MUDFLAP
566     AM_CFLAGS = -fmudflap
567     else
568     AM_CFLAGS =
569     endif
570     -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
571     +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
572     INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
573     -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
574     VERSION = 1
575     --- elfutils/libdwfl/Makefile.in
576     +++ elfutils/libdwfl/Makefile.in
577     @@ -128,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
578     INSTALL_SCRIPT = @INSTALL_SCRIPT@
579     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
580     LDFLAGS = @LDFLAGS@
581     +LD_AS_NEEDED = @LD_AS_NEEDED@
582     LEX = @LEX@
583     LEXLIB = @LEXLIB@
584     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
585     @@ -157,6 +158,7 @@ SHELL = @SHELL@
586     STRIP = @STRIP@
587     USE_NLS = @USE_NLS@
588     VERSION = 1
589     +WEXTRA = @WEXTRA@
590     XGETTEXT = @XGETTEXT@
591     XGETTEXT_015 = @XGETTEXT_015@
592     YACC = @YACC@
593     @@ -212,9 +214,9 @@ target_alias = @target_alias@
594     top_builddir = @top_builddir@
595     top_srcdir = @top_srcdir@
596     @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
597     -@MUDFLAP_FALSE@ -Wextra -std=gnu99
598     +@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
599     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
600     -@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99
601     +@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99
602     INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
603     -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
604    
605     --- elfutils/libebl/ChangeLog
606     +++ elfutils/libebl/ChangeLog
607     @@ -505,6 +505,11 @@
608     * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
609     tracking works right.
610    
611     +2005-05-31 Roland McGrath <roland@redhat.com>
612     +
613     + * Makefile.am (WEXTRA): New variable, substituted by configure.
614     + (AM_CFLAGS): Use it in place of -Wextra.
615     +
616     2005-05-21 Ulrich Drepper <drepper@redhat.com>
617    
618     * libebl_x86_64.map: Add x86_64_core_note.
619     --- elfutils/libebl/Makefile.am
620     +++ elfutils/libebl/Makefile.am
621     @@ -25,12 +25,13 @@
622     ## <http://www.openinventionnetwork.com>.
623     ##
624     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
625     +WEXTRA = @WEXTRA@
626     if MUDFLAP
627     AM_CFLAGS = -fmudflap
628     else
629     AM_CFLAGS =
630     endif
631     -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
632     +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
633     -std=gnu99
634    
635     INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
636     --- elfutils/libebl/Makefile.in
637     +++ elfutils/libebl/Makefile.in
638     @@ -120,6 +120,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
639     INSTALL_SCRIPT = @INSTALL_SCRIPT@
640     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
641     LDFLAGS = @LDFLAGS@
642     +LD_AS_NEEDED = @LD_AS_NEEDED@
643     LEX = @LEX@
644     LEXLIB = @LEXLIB@
645     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
646     @@ -149,6 +150,7 @@ SHELL = @SHELL@
647     STRIP = @STRIP@
648     USE_NLS = @USE_NLS@
649     VERSION = 1
650     +WEXTRA = @WEXTRA@
651     XGETTEXT = @XGETTEXT@
652     XGETTEXT_015 = @XGETTEXT_015@
653     YACC = @YACC@
654     @@ -204,9 +206,9 @@ target_alias = @target_alias@
655     top_builddir = @top_builddir@
656     top_srcdir = @top_srcdir@
657     @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
658     -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
659     +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
660     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
661     -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
662     +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
663     INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
664     -I$(top_srcdir)/lib -I..
665    
666     --- elfutils/libelf/ChangeLog
667     +++ elfutils/libelf/ChangeLog
668     @@ -303,6 +303,11 @@
669     If section content hasn't been read yet, do it before looking for the
670     block size. If no section data present, infer size of section header.
671    
672     +2005-05-31 Roland McGrath <roland@redhat.com>
673     +
674     + * Makefile.am (WEXTRA): New variable, substituted by configure.
675     + (AM_CFLAGS): Use it in place of -Wextra.
676     +
677     2005-05-11 Ulrich Drepper <drepper@redhat.com>
678    
679     * elf.h: Update again.
680     --- elfutils/libelf/common.h
681     +++ elfutils/libelf/common.h
682     @@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
683     (Var) = (sizeof (Var) == 1 \
684     ? (unsigned char) (Var) \
685     : (sizeof (Var) == 2 \
686     - ? bswap_16 (Var) \
687     + ? (unsigned short int) bswap_16 (Var) \
688     : (sizeof (Var) == 4 \
689     ? bswap_32 (Var) \
690     : bswap_64 (Var))))
691     @@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
692     (Dst) = (sizeof (Var) == 1 \
693     ? (unsigned char) (Var) \
694     : (sizeof (Var) == 2 \
695     - ? bswap_16 (Var) \
696     + ? (unsigned short int) bswap_16 (Var) \
697     : (sizeof (Var) == 4 \
698     ? bswap_32 (Var) \
699     : bswap_64 (Var))))
700     --- elfutils/libelf/Makefile.am
701     +++ elfutils/libelf/Makefile.am
702     @@ -25,6 +25,7 @@
703     ## <http://www.openinventionnetwork.com>.
704     ##
705     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
706     +WEXTRA = @WEXTRA@
707     if MUDFLAP
708     AM_CFLAGS = -fmudflap
709     else
710     @@ -33,7 +34,10 @@ endif
711     if BUILD_STATIC
712     AM_CFLAGS += -fpic
713     endif
714     -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
715     +if BUILD_STATIC
716     +AM_CFLAGS += -fpic
717     +endif
718     +AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
719     $($(*F)_CFLAGS)
720     INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
721     GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
722     --- elfutils/libelf/Makefile.in
723     +++ elfutils/libelf/Makefile.in
724     @@ -34,7 +34,7 @@ PRE_UNINSTALL = :
725     POST_UNINSTALL = :
726     build_triplet = @build@
727     host_triplet = @host@
728     -@BUILD_STATIC_TRUE@am__append_1 = -fpic
729     +@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic
730     @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
731     @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
732     subdir = libelf
733     @@ -168,6 +168,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
734     INSTALL_SCRIPT = @INSTALL_SCRIPT@
735     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
736     LDFLAGS = @LDFLAGS@
737     +LD_AS_NEEDED = @LD_AS_NEEDED@
738     LEX = @LEX@
739     LEXLIB = @LEXLIB@
740     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
741     @@ -197,6 +198,7 @@ SHELL = @SHELL@
742     STRIP = @STRIP@
743     USE_NLS = @USE_NLS@
744     VERSION = 1
745     +WEXTRA = @WEXTRA@
746     XGETTEXT = @XGETTEXT@
747     XGETTEXT_015 = @XGETTEXT_015@
748     YACC = @YACC@
749     @@ -252,10 +254,10 @@ target_alias = @target_alias@
750     top_builddir = @top_builddir@
751     top_srcdir = @top_srcdir@
752     @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
753     -@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \
754     +@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
755     @MUDFLAP_FALSE@ $($(*F)_CFLAGS)
756     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \
757     -@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
758     +@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
759     @MUDFLAP_TRUE@ $($(*F)_CFLAGS)
760     INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
761     GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
762     --- elfutils/m4/Makefile.in
763     +++ elfutils/m4/Makefile.in
764     @@ -70,6 +70,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
765     INSTALL_SCRIPT = @INSTALL_SCRIPT@
766     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
767     LDFLAGS = @LDFLAGS@
768     +LD_AS_NEEDED = @LD_AS_NEEDED@
769     LEX = @LEX@
770     LEXLIB = @LEXLIB@
771     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
772     @@ -99,6 +100,7 @@ SHELL = @SHELL@
773     STRIP = @STRIP@
774     USE_NLS = @USE_NLS@
775     VERSION = @VERSION@
776     +WEXTRA = @WEXTRA@
777     XGETTEXT = @XGETTEXT@
778     XGETTEXT_015 = @XGETTEXT_015@
779     YACC = @YACC@
780     --- elfutils/Makefile.in
781     +++ elfutils/Makefile.in
782     @@ -97,6 +97,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
783     INSTALL_SCRIPT = @INSTALL_SCRIPT@
784     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
785     LDFLAGS = @LDFLAGS@
786     +LD_AS_NEEDED = @LD_AS_NEEDED@
787     LEX = @LEX@
788     LEXLIB = @LEXLIB@
789     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
790     @@ -126,6 +127,7 @@ SHELL = @SHELL@
791     STRIP = @STRIP@
792     USE_NLS = @USE_NLS@
793     VERSION = @VERSION@
794     +WEXTRA = @WEXTRA@
795     XGETTEXT = @XGETTEXT@
796     XGETTEXT_015 = @XGETTEXT_015@
797     YACC = @YACC@
798     --- elfutils/src/ChangeLog
799     +++ elfutils/src/ChangeLog
800     @@ -30,6 +30,8 @@
801    
802     * readelf.c (hex_dump): Fix rounding error in whitespace calculation.
803    
804     + * Makefile.am (readelf_no_Werror): New variable.
805     +
806     2007-10-15 Roland McGrath <roland@redhat.com>
807    
808     * make-debug-archive.in: New file.
809     @@ -469,6 +471,10 @@
810     * elflint.c (valid_e_machine): Add EM_ALPHA.
811     Reported by Christian Aichinger <Greek0@gmx.net>.
812    
813     + * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
814     + MADV_SEQUENTIAL if undefined. Don't call posix_madvise
815     + if neither is defined.
816     +
817     2006-08-08 Ulrich Drepper <drepper@redhat.com>
818    
819     * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
820     @@ -545,6 +551,10 @@
821     * Makefile.am: Add hacks to create dependency files for non-generic
822     linker.
823    
824     +2006-04-05 Roland McGrath <roland@redhat.com>
825     +
826     + * strings.c (MAP_POPULATE): Define to 0 if undefined.
827     +
828     2006-06-12 Ulrich Drepper <drepper@redhat.com>
829    
830     * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
831     @@ -893,6 +903,11 @@
832     * readelf.c (print_debug_loc_section): Fix indentation for larger
833     address size.
834    
835     +2005-05-31 Roland McGrath <roland@redhat.com>
836     +
837     + * Makefile.am (WEXTRA): New variable, substituted by configure.
838     + (AM_CFLAGS): Use it in place of -Wextra.
839     +
840     2005-05-30 Roland McGrath <roland@redhat.com>
841    
842     * readelf.c (print_debug_line_section): Print section offset of each
843     --- elfutils/src/findtextrel.c
844     +++ elfutils/src/findtextrel.c
845     @@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
846    
847    
848     static void
849     -check_rel (size_t nsegments, struct segments segments[nsegments],
850     +check_rel (size_t nsegments, struct segments segments[
851     +#if __GNUC__ >= 4
852     + nsegments
853     +#endif
854     + ],
855     GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
856     const char *fname, bool more_than_one, void **knownsrcs)
857     {
858     --- elfutils/src/Makefile.am
859     +++ elfutils/src/Makefile.am
860     @@ -26,6 +26,7 @@
861     ##
862     DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
863     -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
864     +WEXTRA = @WEXTRA@
865     if MUDFLAP
866     AM_CFLAGS = -fmudflap
867     else
868     @@ -33,7 +34,7 @@ AM_CFLAGS =
869     endif
870     AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
871     $(if $($(*F)_no_Werror),,-Werror) \
872     - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
873     + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
874     $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
875    
876     INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
877     @@ -108,6 +109,9 @@ strings_no_Wformat = yes
878     # XXX While the file is not finished, don't warn about this
879     ldgeneric_no_Wunused = yes
880    
881     +# Buggy old compilers.
882     +readelf_no_Werror = yes
883     +
884     readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
885     nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
886     size_LDADD = $(libelf) $(libeu) $(libmudflap)
887     --- elfutils/src/Makefile.in
888     +++ elfutils/src/Makefile.in
889     @@ -200,6 +200,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
890     INSTALL_SCRIPT = @INSTALL_SCRIPT@
891     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
892     LDFLAGS = @LDFLAGS@
893     +LD_AS_NEEDED = @LD_AS_NEEDED@
894     LEX = @LEX@
895     LEXLIB = @LEXLIB@
896     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
897     @@ -229,6 +230,7 @@ SHELL = @SHELL@
898     STRIP = @STRIP@
899     USE_NLS = @USE_NLS@
900     VERSION = @VERSION@
901     +WEXTRA = @WEXTRA@
902     XGETTEXT = @XGETTEXT@
903     XGETTEXT_015 = @XGETTEXT_015@
904     YACC = @YACC@ -d
905     @@ -286,13 +288,13 @@ top_srcdir = @top_srcdir@
906     @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
907     @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
908     @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
909     -@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
910     +@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
911     @MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2) \
912     @MUDFLAP_FALSE@ $(CFLAGS_$(*F))
913     @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
914     @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \
915     @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \
916     -@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
917     +@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
918     @MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
919     INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
920     -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
921     @@ -334,6 +336,9 @@ size_no_Wformat = yes
922     strings_no_Wformat = yes
923     # XXX While the file is not finished, don't warn about this
924     ldgeneric_no_Wunused = yes
925     +
926     +# Buggy old compilers.
927     +readelf_no_Werror = yes
928     readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
929     nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
930     size_LDADD = $(libelf) $(libeu) $(libmudflap)
931     --- elfutils/src/strings.c
932     +++ elfutils/src/strings.c
933     @@ -51,6 +51,10 @@
934    
935     #include <system.h>
936    
937     +#ifndef MAP_POPULATE
938     +# define MAP_POPULATE 0
939     +#endif
940     +
941    
942     /* Prototypes of local functions. */
943     static int read_fd (int fd, const char *fname, off64_t fdlen);
944     @@ -491,8 +495,13 @@ map_file (int fd, off64_t start_off, off
945     fd, start_off);
946     if (mem != MAP_FAILED)
947     {
948     +#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
949     +# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
950     +#endif
951     +#ifdef POSIX_MADV_SEQUENTIAL
952     /* We will go through the mapping sequentially. */
953     (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
954     +#endif
955     break;
956     }
957     if (errno != EINVAL && errno != ENOMEM)
958     --- elfutils/src/strip.c
959     +++ elfutils/src/strip.c
960     @@ -52,6 +52,12 @@
961     #include <libebl.h>
962     #include <system.h>
963    
964     +#ifdef HAVE_FUTIMES
965     +# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
966     +#else
967     +# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
968     +#endif
969     +
970    
971     /* Name and version of program. */
972     static void print_version (FILE *stream, struct argp_state *state);
973     @@ -300,8 +306,18 @@ process_file (const char *fname)
974    
975     /* If we have to preserve the timestamp, we need it in the
976     format utimes() understands. */
977     +#ifdef HAVE_STRUCT_STAT_ST_ATIM
978     TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
979     +#else
980     + tv[0].tv_sec = pre_st.st_atime;
981     + tv[0].tv_usec = 0;
982     +#endif
983     +#ifdef HAVE_STRUCT_STAT_ST_MTIM
984     TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
985     +#else
986     + tv[1].tv_sec = pre_st.st_atime;
987     + tv[1].tv_usec = 0;
988     +#endif
989     }
990    
991     /* Open the file. */
992     @@ -1702,7 +1718,7 @@ handle_elf (int fd, Elf *elf, const char
993     /* If requested, preserve the timestamp. */
994     if (tvp != NULL)
995     {
996     - if (futimes (fd, tvp) != 0)
997     + if (FUTIMES (fd, output_fname, tvp) != 0)
998     {
999     error (0, errno, gettext ("\
1000     cannot set access and modification date of '%s'"),
1001     @@ -1759,7 +1775,7 @@ handle_ar (int fd, Elf *elf, const char
1002    
1003     if (tvp != NULL)
1004     {
1005     - if (unlikely (futimes (fd, tvp) != 0))
1006     + if (unlikely (FUTIMES (fd, fname, tvp) != 0))
1007     {
1008     error (0, errno, gettext ("\
1009     cannot set access and modification date of '%s'"), fname);
1010     --- elfutils/tests/ChangeLog
1011     +++ elfutils/tests/ChangeLog
1012     @@ -606,6 +606,11 @@
1013     * Makefile.am (TESTS): Add run-elflint-test.sh.
1014     (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
1015    
1016     +2005-05-31 Roland McGrath <roland@redhat.com>
1017     +
1018     + * Makefile.am (WEXTRA): New variable, substituted by configure.
1019     + (AM_CFLAGS): Use it in place of -Wextra.
1020     +
1021     2005-05-24 Ulrich Drepper <drepper@redhat.com>
1022    
1023     * get-files.c (main): Use correct format specifier.
1024     --- elfutils/tests/Makefile.am
1025     +++ elfutils/tests/Makefile.am
1026     @@ -25,12 +25,13 @@
1027     ## <http://www.openinventionnetwork.com>.
1028     ##
1029     DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
1030     +WEXTRA = @WEXTRA@
1031     if MUDFLAP
1032     -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
1033     +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
1034     $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
1035     BUILD_RPATH = \$$ORIGIN/../backends
1036     else
1037     -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
1038     +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
1039     $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
1040     BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
1041     endif
1042     --- elfutils/tests/Makefile.in
1043     +++ elfutils/tests/Makefile.in
1044     @@ -323,6 +323,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
1045     INSTALL_SCRIPT = @INSTALL_SCRIPT@
1046     INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1047     LDFLAGS = @LDFLAGS@
1048     +LD_AS_NEEDED = @LD_AS_NEEDED@
1049     LEX = @LEX@
1050     LEXLIB = @LEXLIB@
1051     LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
1052     @@ -352,6 +353,7 @@ SHELL = @SHELL@
1053     STRIP = @STRIP@
1054     USE_NLS = @USE_NLS@
1055     VERSION = @VERSION@
1056     +WEXTRA = @WEXTRA@
1057     XGETTEXT = @XGETTEXT@
1058     XGETTEXT_015 = @XGETTEXT_015@
1059     YACC = @YACC@
1060     @@ -406,10 +408,10 @@ sysconfdir = @sysconfdir@
1061     target_alias = @target_alias@
1062     top_builddir = @top_builddir@
1063     top_srcdir = @top_srcdir@
1064     -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
1065     +@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
1066     @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
1067    
1068     -@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
1069     +@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
1070     @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
1071    
1072     @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends