]> git.pld-linux.org Git - packages/elfutils.git/blame - elfutils-portability.patch
- updated for 0.121 (from FC)
[packages/elfutils.git] / elfutils-portability.patch
CommitLineData
b4c3777d
JB
1--- elfutils/backends/ChangeLog
2+++ elfutils/backends/ChangeLog
bbcfe1b1 3@@ -56,6 +56,11 @@
b4c3777d
JB
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.
bbcfe1b1 15@@ -78,6 +83,9 @@
b4c3777d
JB
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
98f2540e
JB
27@@ -25,12 +25,14 @@
28 ## <http://www.openinventionnetwork.com>.
b4c3777d
JB
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 \
98f2540e 43@@ -63,7 +65,7 @@ textrel_check = if readelf -d $@ | fgrep
b4c3777d
JB
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
bbcfe1b1 54@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
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@
bbcfe1b1 62@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d
JB
63 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
64 USE_NLS = @USE_NLS@
65 VERSION = @VERSION@
66+WEXTRA = @WEXTRA@
67 XGETTEXT = @XGETTEXT@
68 YACC = @YACC@
69 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 70@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
b4c3777d
JB
71 sysconfdir = @sysconfdir@
72 target_alias = @target_alias@
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..
bbcfe1b1 82@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
b4c3777d
JB
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
0dcd74c7
JR
91--- elfutils/ChangeLog
92+++ elfutils/ChangeLog
b4c3777d
JB
93@@ -1,3 +1,7 @@
94+2005-11-22 Roland McGrath <roland@redhat.com>
95+
96+ * configure.ac: Check for --as-needed linker option.
97+
98 2005-11-18 Roland McGrath <roland@redhat.com>
99
100 * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
101@@ -45,6 +49,17 @@
49fd4b14
JB
102 * Makefile.am (all_SUBDIRS): Add libdwfl.
103 * configure.ac: Write libdwfl/Makefile.
104
105+2005-05-31 Roland McGrath <roland@redhat.com>
0dcd74c7
JR
106+
107+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
108+
49fd4b14
JB
109+ * configure.ac: Check for struct stat st_?tim members.
110+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.
0dcd74c7 111+
49fd4b14
JB
112+ * configure.ac: Check for futimes function.
113+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
114+ (handle_ar) [! HAVE_FUTIMES]: Likewise.
0dcd74c7 115+
49fd4b14 116 2005-05-19 Roland McGrath <roland@redhat.com>
0dcd74c7 117
49fd4b14 118 * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
0dcd74c7
JR
119--- elfutils/config/Makefile.in
120+++ elfutils/config/Makefile.in
b4c3777d
JB
121@@ -84,6 +84,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
122 INSTALL_SCRIPT = @INSTALL_SCRIPT@
123 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
124 LDFLAGS = @LDFLAGS@
125+LD_AS_NEEDED = @LD_AS_NEEDED@
126 LEX = @LEX@
127 LEXLIB = @LEXLIB@
128 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
129@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
130 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
131 USE_NLS = @USE_NLS@
132 VERSION = @VERSION@
133+WEXTRA = @WEXTRA@
134 XGETTEXT = @XGETTEXT@
135 YACC = @YACC@
136 ac_ct_CC = @ac_ct_CC@
137--- elfutils/configure
138+++ elfutils/configure
bbcfe1b1 139@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
0dcd74c7
JR
140 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
141
142 ac_unique_file="libelf/libelf.h"
b4c3777d
JB
143-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
144+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
0dcd74c7
JR
145 ac_subst_files=''
146
147 # Initialize some variables set by options.
b4c3777d 148@@ -3385,6 +3385,92 @@ echo "$as_me: error: gcc with C99 suppor
0dcd74c7
JR
149 fi
150
151
152+echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
153+echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6
154+if test "${ac_cv_cc_wextra+set}" = set; then
155+ echo $ECHO_N "(cached) $ECHO_C" >&6
156+else
157+ old_CFLAGS="$CFLAGS"
158+CFLAGS="$CFLAGS -Wextra"
159+cat >conftest.$ac_ext <<_ACEOF
160+void foo (void) { }
161+_ACEOF
162+rm -f conftest.$ac_objext
163+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
164+ (eval $ac_compile) 2>conftest.er1
165+ ac_status=$?
166+ grep -v '^ *+' conftest.er1 >conftest.err
167+ rm -f conftest.er1
168+ cat conftest.err >&5
169+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
170+ (exit $ac_status); } &&
171+ { ac_try='test -z "$ac_c_werror_flag"
172+ || test ! -s conftest.err'
173+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
174+ (eval $ac_try) 2>&5
175+ ac_status=$?
176+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
177+ (exit $ac_status); }; } &&
178+ { ac_try='test -s conftest.$ac_objext'
179+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
180+ (eval $ac_try) 2>&5
181+ ac_status=$?
182+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
183+ (exit $ac_status); }; }; then
184+ ac_cv_cc_wextra=yes
185+else
186+ echo "$as_me: failed program was:" >&5
187+sed 's/^/| /' conftest.$ac_ext >&5
188+
189+ac_cv_cc_wextra=no
190+fi
191+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
192+CFLAGS="$old_CFLAGS"
193+fi
194+echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
195+echo "${ECHO_T}$ac_cv_cc_wextra" >&6
196+
49fd4b14 197+if test "x$ac_cv_cc_wextra" = xyes; then
0dcd74c7
JR
198+ WEXTRA=-Wextra
199+else
200+ WEXTRA=-W
201+fi
202+
b4c3777d
JB
203+
204+echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
205+echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6
206+if test "${ac_cv_as_needed+set}" = set; then
207+ echo $ECHO_N "(cached) $ECHO_C" >&6
208+else
209+ cat > conftest.c <<EOF
210+int main (void) { return 0; }
211+EOF
212+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
213+ -fPIC -shared -o conftest.so conftest.c
214+ -Wl,--as-needed 1>&5'
215+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
216+ (eval $ac_try) 2>&5
217+ ac_status=$?
218+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
219+ (exit $ac_status); }; }
220+then
221+ ac_cv_as_needed=yes
222+else
223+ ac_cv_as_needed=no
224+fi
225+rm -f conftest*
226+fi
227+echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
228+echo "${ECHO_T}$ac_cv_as_needed" >&6
229+if test "x$ac_cv_as_needed" = xyes; then
230+ LD_AS_NEEDED=-Wl,--as-needed
231+else
232+ LD_AS_NEEDED=
233+fi
234+
235+
236+
0dcd74c7
JR
237+
238 LOCALEDIR=$datadir
239
240 cat >>confdefs.h <<_ACEOF
b4c3777d 241@@ -4987,6 +5073,8 @@ s,@YACC@,$YACC,;t t
0dcd74c7
JR
242 s,@LEX@,$LEX,;t t
243 s,@LEXLIB@,$LEXLIB,;t t
244 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
245+s,@WEXTRA@,$WEXTRA,;t t
b4c3777d 246+s,@LD_AS_NEEDED@,$LD_AS_NEEDED,;t t
0dcd74c7
JR
247 s,@LOCALEDIR@,$LOCALEDIR,;t t
248 s,@DATADIRNAME@,$DATADIRNAME,;t t
249 s,@NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t
250--- elfutils/configure.ac
251+++ elfutils/configure.ac
b4c3777d 252@@ -69,6 +69,34 @@ CFLAGS="$old_CFLAGS"])
0dcd74c7
JR
253 AS_IF([test "x$ac_cv_c99" != xyes],
254 AC_MSG_ERROR([gcc with C99 support required]))
255
256+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
257+old_CFLAGS="$CFLAGS"
258+CFLAGS="$CFLAGS -Wextra"
259+AC_COMPILE_IFELSE([void foo (void) { }],
260+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
261+CFLAGS="$old_CFLAGS"])
262+AC_SUBST(WEXTRA)
49fd4b14 263+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
b4c3777d
JB
264+
265+AC_CACHE_CHECK([for --as-needed linker option],
266+ ac_cv_as_needed, [dnl
267+cat > conftest.c <<EOF
268+int main (void) { return 0; }
269+EOF
270+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
271+ -fPIC -shared -o conftest.so conftest.c
272+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
273+then
274+ ac_cv_as_needed=yes
275+else
276+ ac_cv_as_needed=no
277+fi
278+rm -f conftest*])
279+AS_IF([test "x$ac_cv_as_needed" = xyes],
280+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
281+AC_SUBST(LD_AS_NEEDED)
282+
0dcd74c7
JR
283+
284 LOCALEDIR=$datadir
285 AC_SUBST(LOCALEDIR)
286 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
287--- elfutils/lib/ChangeLog
288+++ elfutils/lib/ChangeLog
98f2540e 289@@ -16,6 +16,11 @@
0dcd74c7
JR
290 * Makefile.am (libeu_a_SOURCES): Add it.
291 * system.h: Declare crc32_file.
292
293+2005-02-07 Roland McGrath <roland@redhat.com>
294+
295+ * Makefile.am (WEXTRA): New variable, substituted by configure.
296+ (AM_CFLAGS): Use it in place of -Wextra.
297+
298 2005-04-30 Ulrich Drepper <drepper@redhat.com>
299
300 * Makefile.am: Use -ffunction-sections for xmalloc.c.
301--- elfutils/lib/Makefile.am
302+++ elfutils/lib/Makefile.am
98f2540e
JB
303@@ -25,12 +25,13 @@
304 ## <http://www.openinventionnetwork.com>.
0dcd74c7
JR
305 ##
306 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
307+WEXTRA = @WEXTRA@
308 if MUDFLAP
309 AM_CFLAGS = -fmudflap
310 else
311 AM_CFLAGS =
312 endif
313-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
314+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS)
315 INCLUDES = -I$(srcdir)/../libelf -I..
316
317 noinst_LIBRARIES = libeu.a
318--- elfutils/lib/Makefile.in
319+++ elfutils/lib/Makefile.in
bbcfe1b1 320@@ -103,6 +103,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
321 INSTALL_SCRIPT = @INSTALL_SCRIPT@
322 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
323 LDFLAGS = @LDFLAGS@
324+LD_AS_NEEDED = @LD_AS_NEEDED@
325 LEX = @LEX@
326 LEXLIB = @LEXLIB@
327 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 328@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 329 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
330 USE_NLS = @USE_NLS@
331 VERSION = @VERSION@
332+WEXTRA = @WEXTRA@
333 XGETTEXT = @XGETTEXT@
334 YACC = @YACC@
335 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 336@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
337 sysconfdir = @sysconfdir@
338 target_alias = @target_alias@
339 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
340-@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS)
341+@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS)
342 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
343-@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS)
344+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS)
345 INCLUDES = -I$(srcdir)/../libelf -I..
346 noinst_LIBRARIES = libeu.a
98f2540e 347 libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
49fd4b14
JB
348--- elfutils/libasm/ChangeLog
349+++ elfutils/libasm/ChangeLog
b4c3777d 350@@ -28,6 +28,11 @@
49fd4b14
JB
351 * asm_error.c: Add new error ASM_E_IOERROR.
352 * libasmP.h: Add ASM_E_IOERROR definition.
353
354+2005-05-31 Roland McGrath <roland@redhat.com>
355+
356+ * Makefile.am (WEXTRA): New variable, substituted by configure.
357+ (AM_CFLAGS): Use it in place of -Wextra.
358+
359 2005-02-15 Ulrich Drepper <drepper@redhat.com>
360
361 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
0dcd74c7
JR
362--- elfutils/libasm/Makefile.am
363+++ elfutils/libasm/Makefile.am
98f2540e
JB
364@@ -25,12 +25,13 @@
365 ## <http://www.openinventionnetwork.com>.
0dcd74c7
JR
366 ##
367 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
368+WEXTRA = @WEXTRA@
369 if MUDFLAP
370 AM_CFLAGS = -fmudflap
371 else
372 AM_CFLAGS =
373 endif
49fd4b14
JB
374-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
375+AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
b4c3777d
JB
376 INCLUDES = -I. -I$(srcdir) -I.. \
377 -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
0dcd74c7 378 -I$(top_srcdir)/lib
0dcd74c7
JR
379--- elfutils/libasm/Makefile.in
380+++ elfutils/libasm/Makefile.in
bbcfe1b1 381@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
382 INSTALL_SCRIPT = @INSTALL_SCRIPT@
383 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
384 LDFLAGS = @LDFLAGS@
385+LD_AS_NEEDED = @LD_AS_NEEDED@
386 LEX = @LEX@
387 LEXLIB = @LEXLIB@
388 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 389@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 390 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
391 USE_NLS = @USE_NLS@
392 VERSION = 1
393+WEXTRA = @WEXTRA@
394 XGETTEXT = @XGETTEXT@
395 YACC = @YACC@
396 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 397@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
398 sysconfdir = @sysconfdir@
399 target_alias = @target_alias@
49fd4b14
JB
400 @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
401-@MUDFLAP_FALSE@ -Wextra -Wformat=2
402+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2
403 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
404-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2
405+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2
b4c3777d
JB
406 INCLUDES = -I. -I$(srcdir) -I.. \
407 -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
0dcd74c7 408 -I$(top_srcdir)/lib
0dcd74c7
JR
409--- elfutils/libcpu/ChangeLog
410+++ elfutils/libcpu/ChangeLog
411@@ -1,3 +1,8 @@
412+2005-04-04 Roland McGrath <roland@redhat.com>
413+
414+ * Makefile.am (WEXTRA): New variable, substituted by configure.
415+ (AM_CFLAGS): Use it instead of -Wextra.
416+
417 2005-02-15 Ulrich Drepper <drepper@redhat.com>
418
419 * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
420--- elfutils/libcpu/Makefile.am
421+++ elfutils/libcpu/Makefile.am
98f2540e
JB
422@@ -25,7 +25,8 @@
423 ## <http://www.openinventionnetwork.com>.
0dcd74c7
JR
424 ##
425 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
426-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
427+WEXTRA = @WEXTRA@
428+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
429 INCLUDES = -I$(srcdir)
430
431 noinst_LIBRARIES = libcpu_i386.a
432--- elfutils/libcpu/Makefile.in
433+++ elfutils/libcpu/Makefile.in
bbcfe1b1 434@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
435 INSTALL_SCRIPT = @INSTALL_SCRIPT@
436 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
437 LDFLAGS = @LDFLAGS@
438+LD_AS_NEEDED = @LD_AS_NEEDED@
439 LEX = @LEX@
440 LEXLIB = @LEXLIB@
441 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 442@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 443 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
444 USE_NLS = @USE_NLS@
445 VERSION = @VERSION@
446+WEXTRA = @WEXTRA@
447 XGETTEXT = @XGETTEXT@
448 YACC = @YACC@
449 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 450@@ -175,7 +177,7 @@ sbindir = @sbindir@
0dcd74c7
JR
451 sharedstatedir = @sharedstatedir@
452 sysconfdir = @sysconfdir@
453 target_alias = @target_alias@
454-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
455+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
456 INCLUDES = -I$(srcdir)
457 noinst_LIBRARIES = libcpu_i386.a
458 libcpu_i386_a_SOURCES = i386_dis.c
49fd4b14
JB
459--- elfutils/libdw/ChangeLog
460+++ elfutils/libdw/ChangeLog
bbcfe1b1 461@@ -290,6 +290,11 @@
49fd4b14
JB
462
463 2005-05-31 Roland McGrath <roland@redhat.com>
464
465+ * Makefile.am (WEXTRA): New variable, substituted by configure.
466+ (AM_CFLAGS): Use it in place of -Wextra.
467+
468+2005-05-31 Roland McGrath <roland@redhat.com>
469+
470 * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
471 formref offset.
472
0dcd74c7
JR
473--- elfutils/libdw/Makefile.am
474+++ elfutils/libdw/Makefile.am
98f2540e
JB
475@@ -25,6 +25,7 @@
476 ## <http://www.openinventionnetwork.com>.
0dcd74c7 477 ##
49fd4b14 478 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
0dcd74c7
JR
479+WEXTRA = @WEXTRA@
480 if MUDFLAP
481 AM_CFLAGS = -fmudflap
482 else
98f2540e 483@@ -33,7 +34,7 @@ endif
b4c3777d
JB
484 if BUILD_STATIC
485 AM_CFLAGS += -fpic
0dcd74c7
JR
486 endif
487-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
488+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
489 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
490 VERSION = 1
491
492--- elfutils/libdw/Makefile.in
493+++ elfutils/libdw/Makefile.in
bbcfe1b1 494@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
495 INSTALL_SCRIPT = @INSTALL_SCRIPT@
496 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
497 LDFLAGS = @LDFLAGS@
498+LD_AS_NEEDED = @LD_AS_NEEDED@
499 LEX = @LEX@
500 LEXLIB = @LEXLIB@
501 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 502@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 503 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
504 USE_NLS = @USE_NLS@
505 VERSION = 1
506+WEXTRA = @WEXTRA@
507 XGETTEXT = @XGETTEXT@
508 YACC = @YACC@
509 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 510@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
511 sysconfdir = @sysconfdir@
512 target_alias = @target_alias@
b4c3777d
JB
513 @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
514-@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99
515+@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
516 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \
517-@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
518+@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \
519+@MUDFLAP_TRUE@ -std=gnu99
0dcd74c7 520 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
49fd4b14
JB
521 COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
522 $(COMPILE)))
523--- elfutils/libdwfl/ChangeLog
524+++ elfutils/libdwfl/ChangeLog
bbcfe1b1 525@@ -286,6 +286,11 @@
49fd4b14
JB
526
527 2005-07-21 Roland McGrath <roland@redhat.com>
528
529+ * Makefile.am (WEXTRA): New variable, substituted by configure.
530+ (AM_CFLAGS): Use it in place of -Wextra.
531+
532+2005-07-21 Roland McGrath <roland@redhat.com>
533+
534 * Makefile.am (noinst_HEADERS): Add loc2c.c.
535
536 * test2.c (main): Check sscanf result to quiet warning.
537--- elfutils/libdwfl/Makefile.am
538+++ elfutils/libdwfl/Makefile.am
98f2540e
JB
539@@ -27,12 +27,13 @@
540 ## <http://www.openinventionnetwork.com>.
49fd4b14
JB
541 ##
542 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
543+WEXTRA = @WEXTRA@
544 if MUDFLAP
545 AM_CFLAGS = -fmudflap
546 else
547 AM_CFLAGS =
548 endif
549-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
550+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
551 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
552 -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
553 VERSION = 1
554--- elfutils/libdwfl/Makefile.in
555+++ elfutils/libdwfl/Makefile.in
bbcfe1b1 556@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
557 INSTALL_SCRIPT = @INSTALL_SCRIPT@
558 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
559 LDFLAGS = @LDFLAGS@
560+LD_AS_NEEDED = @LD_AS_NEEDED@
561 LEX = @LEX@
562 LEXLIB = @LEXLIB@
563 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 564@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 565 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
49fd4b14
JB
566 USE_NLS = @USE_NLS@
567 VERSION = 1
568+WEXTRA = @WEXTRA@
569 XGETTEXT = @XGETTEXT@
570 YACC = @YACC@
571 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 572@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
49fd4b14
JB
573 sysconfdir = @sysconfdir@
574 target_alias = @target_alias@
575 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
576-@MUDFLAP_FALSE@ -Wextra -std=gnu99
577+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
578 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
579-@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99
580+@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99
581 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
582 -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
583
584--- elfutils/libebl/ChangeLog
585+++ elfutils/libebl/ChangeLog
bbcfe1b1 586@@ -413,6 +413,11 @@
49fd4b14
JB
587 * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
588 tracking works right.
589
590+2005-05-31 Roland McGrath <roland@redhat.com>
591+
592+ * Makefile.am (WEXTRA): New variable, substituted by configure.
593+ (AM_CFLAGS): Use it in place of -Wextra.
594+
595 2005-05-21 Ulrich Drepper <drepper@redhat.com>
596
597 * libebl_x86_64.map: Add x86_64_core_note.
0dcd74c7
JR
598--- elfutils/libebl/Makefile.am
599+++ elfutils/libebl/Makefile.am
98f2540e
JB
600@@ -25,12 +25,13 @@
601 ## <http://www.openinventionnetwork.com>.
0dcd74c7
JR
602 ##
603 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
604+WEXTRA = @WEXTRA@
605 if MUDFLAP
606 AM_CFLAGS = -fmudflap
607 else
608 AM_CFLAGS =
609 endif
610-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
611+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
612 -std=gnu99
613
b4c3777d 614 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
0dcd74c7
JR
615--- elfutils/libebl/Makefile.in
616+++ elfutils/libebl/Makefile.in
bbcfe1b1 617@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
618 INSTALL_SCRIPT = @INSTALL_SCRIPT@
619 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
620 LDFLAGS = @LDFLAGS@
621+LD_AS_NEEDED = @LD_AS_NEEDED@
622 LEX = @LEX@
623 LEXLIB = @LEXLIB@
624 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 625@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 626 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
627 USE_NLS = @USE_NLS@
628 VERSION = 1
629+WEXTRA = @WEXTRA@
630 XGETTEXT = @XGETTEXT@
631 YACC = @YACC@
632 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 633@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
634 sysconfdir = @sysconfdir@
635 target_alias = @target_alias@
636 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
637-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
638+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
639 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
640-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
641+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
b4c3777d
JB
642 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
643 -I$(top_srcdir)/lib -I..
644
49fd4b14
JB
645--- elfutils/libelf/ChangeLog
646+++ elfutils/libelf/ChangeLog
bbcfe1b1 647@@ -136,6 +136,11 @@
49fd4b14
JB
648 If section content hasn't been read yet, do it before looking for the
649 block size. If no section data present, infer size of section header.
650
651+2005-05-31 Roland McGrath <roland@redhat.com>
652+
653+ * Makefile.am (WEXTRA): New variable, substituted by configure.
654+ (AM_CFLAGS): Use it in place of -Wextra.
655+
656 2005-05-11 Ulrich Drepper <drepper@redhat.com>
657
658 * elf.h: Update again.
659--- elfutils/libelf/common.h
660+++ elfutils/libelf/common.h
98f2540e 661@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf)
49fd4b14
JB
662 (Var) = (sizeof (Var) == 1 \
663 ? (unsigned char) (Var) \
664 : (sizeof (Var) == 2 \
665- ? bswap_16 (Var) \
666+ ? (unsigned short int) bswap_16 (Var) \
667 : (sizeof (Var) == 4 \
668 ? bswap_32 (Var) \
669 : bswap_64 (Var))))
98f2540e 670@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf)
49fd4b14
JB
671 (Dst) = (sizeof (Var) == 1 \
672 ? (unsigned char) (Var) \
673 : (sizeof (Var) == 2 \
674- ? bswap_16 (Var) \
675+ ? (unsigned short int) bswap_16 (Var) \
676 : (sizeof (Var) == 4 \
677 ? bswap_32 (Var) \
678 : bswap_64 (Var))))
0dcd74c7
JR
679--- elfutils/libelf/Makefile.am
680+++ elfutils/libelf/Makefile.am
98f2540e
JB
681@@ -25,6 +25,7 @@
682 ## <http://www.openinventionnetwork.com>.
0dcd74c7
JR
683 ##
684 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
685+WEXTRA = @WEXTRA@
686 if MUDFLAP
49fd4b14 687 AM_CFLAGS = -fmudflap
0dcd74c7 688 else
98f2540e 689@@ -33,7 +34,10 @@ endif
49fd4b14
JB
690 if BUILD_STATIC
691 AM_CFLAGS += -fpic
0dcd74c7
JR
692 endif
693-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
49fd4b14
JB
694+if BUILD_STATIC
695+AM_CFLAGS += -fpic
696+endif
0dcd74c7
JR
697+AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
698 $($(*F)_CFLAGS)
699 INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
700 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
701--- elfutils/libelf/Makefile.in
702+++ elfutils/libelf/Makefile.in
bbcfe1b1 703@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
49fd4b14
JB
704 POST_UNINSTALL = :
705 build_triplet = @build@
706 host_triplet = @host@
707-@BUILD_STATIC_TRUE@am__append_1 = -fpic
708+@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic
709 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
710 @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
711 subdir = libelf
bbcfe1b1 712@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
713 INSTALL_SCRIPT = @INSTALL_SCRIPT@
714 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
715 LDFLAGS = @LDFLAGS@
716+LD_AS_NEEDED = @LD_AS_NEEDED@
717 LEX = @LEX@
718 LEXLIB = @LEXLIB@
719 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 720@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 721 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
722 USE_NLS = @USE_NLS@
723 VERSION = 1
724+WEXTRA = @WEXTRA@
725 XGETTEXT = @XGETTEXT@
726 YACC = @YACC@
727 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 728@@ -256,10 +258,10 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
729 sysconfdir = @sysconfdir@
730 target_alias = @target_alias@
49fd4b14
JB
731 @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
732-@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \
733+@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
734 @MUDFLAP_FALSE@ $($(*F)_CFLAGS)
735 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \
736-@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
737+@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
0dcd74c7
JR
738 @MUDFLAP_TRUE@ $($(*F)_CFLAGS)
739 INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
740 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
741--- elfutils/m4/Makefile.in
742+++ elfutils/m4/Makefile.in
b4c3777d
JB
743@@ -82,6 +82,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
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@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
752 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
753 USE_NLS = @USE_NLS@
754 VERSION = @VERSION@
755+WEXTRA = @WEXTRA@
756 XGETTEXT = @XGETTEXT@
757 YACC = @YACC@
758 ac_ct_CC = @ac_ct_CC@
49fd4b14
JB
759--- elfutils/Makefile.in
760+++ elfutils/Makefile.in
b4c3777d
JB
761@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
762 INSTALL_SCRIPT = @INSTALL_SCRIPT@
763 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
764 LDFLAGS = @LDFLAGS@
765+LD_AS_NEEDED = @LD_AS_NEEDED@
766 LEX = @LEX@
767 LEXLIB = @LEXLIB@
768 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
769@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
770 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
771 USE_NLS = @USE_NLS@
772 VERSION = @VERSION@
773+WEXTRA = @WEXTRA@
774 XGETTEXT = @XGETTEXT@
49fd4b14 775 YACC = @YACC@
0dcd74c7 776 ac_ct_CC = @ac_ct_CC@
49fd4b14
JB
777--- elfutils/src/ChangeLog
778+++ elfutils/src/ChangeLog
bbcfe1b1
JB
779@@ -1,3 +1,7 @@
780+2006-04-05 Roland McGrath <roland@redhat.com>
781+
782+ * strings.c (MAP_POPULATE): Define to 0 if undefined.
783+
784 2006-06-12 Ulrich Drepper <drepper@redhat.com>
785
786 * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
787@@ -346,6 +350,11 @@
49fd4b14
JB
788 * readelf.c (print_debug_loc_section): Fix indentation for larger
789 address size.
0dcd74c7 790
49fd4b14
JB
791+2005-05-31 Roland McGrath <roland@redhat.com>
792+
793+ * Makefile.am (WEXTRA): New variable, substituted by configure.
794+ (AM_CFLAGS): Use it in place of -Wextra.
795+
796 2005-05-30 Roland McGrath <roland@redhat.com>
0dcd74c7 797
49fd4b14 798 * readelf.c (print_debug_line_section): Print section offset of each
0dcd74c7
JR
799--- elfutils/src/findtextrel.c
800+++ elfutils/src/findtextrel.c
98f2540e 801@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
0dcd74c7
JR
802
803
804 static void
805-check_rel (size_t nsegments, struct segments segments[nsegments],
806+check_rel (size_t nsegments, struct segments segments[
807+#if __GNUC__ >= 4
808+ nsegments
809+#endif
810+ ],
811 GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
812 const char *fname, bool more_than_one, void **knownsrcs)
813 {
49fd4b14
JB
814--- elfutils/src/Makefile.am
815+++ elfutils/src/Makefile.am
98f2540e 816@@ -26,6 +26,7 @@
49fd4b14
JB
817 ##
818 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
819 -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
820+WEXTRA = @WEXTRA@
821 if MUDFLAP
822 AM_CFLAGS = -fmudflap
823 else
98f2540e 824@@ -33,7 +34,7 @@ AM_CFLAGS =
49fd4b14
JB
825 endif
826 AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
827 $(if $($(*F)_no_Werror),,-Werror) \
828- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
829+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
830 $(if $($(*F)_no_Wformat),,-Wformat=2)
831
832 INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
833--- elfutils/src/Makefile.in
834+++ elfutils/src/Makefile.in
bbcfe1b1 835@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
836 INSTALL_SCRIPT = @INSTALL_SCRIPT@
837 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
838 LDFLAGS = @LDFLAGS@
839+LD_AS_NEEDED = @LD_AS_NEEDED@
840 LEX = @LEX@
841 LEXLIB = @LEXLIB@
842 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 843@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 844 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
49fd4b14
JB
845 USE_NLS = @USE_NLS@
846 VERSION = @VERSION@
847+WEXTRA = @WEXTRA@
848 XGETTEXT = @XGETTEXT@
849 YACC = @YACC@ -d
850 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 851@@ -269,12 +271,12 @@ target_alias = @target_alias@
49fd4b14
JB
852 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
853 @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
854 @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
855-@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
856+@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
857 @MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2)
858 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
859 @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \
860 @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \
861-@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
862+@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
863 @MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2)
864 INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
865 -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
bbcfe1b1
JB
866--- elfutils/src/strings.c
867+++ elfutils/src/strings.c
868@@ -51,6 +51,10 @@
869
870 #include <system.h>
871
872+#ifndef MAP_POPULATE
873+# define MAP_POPULATE 0
874+#endif
875+
876
877 /* Prototypes of local functions. */
878 static int read_fd (int fd, const char *fname, off64_t fdlen);
0dcd74c7
JR
879--- elfutils/src/strip.c
880+++ elfutils/src/strip.c
98f2540e 881@@ -52,6 +52,12 @@
0dcd74c7
JR
882 #include <libebl.h>
883 #include <system.h>
884
885+#ifdef HAVE_FUTIMES
886+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
887+#else
888+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
889+#endif
890+
891
892 /* Name and version of program. */
893 static void print_version (FILE *stream, struct argp_state *state);
98f2540e 894@@ -300,8 +306,18 @@ process_file (const char *fname)
0dcd74c7
JR
895
896 /* If we have to preserve the timestamp, we need it in the
897 format utimes() understands. */
898+#ifdef HAVE_STRUCT_STAT_ST_ATIM
899 TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
900+#else
901+ tv[0].tv_sec = pre_st.st_atime;
902+ tv[0].tv_usec = 0;
903+#endif
904+#ifdef HAVE_STRUCT_STAT_ST_MTIM
905 TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
906+#else
907+ tv[1].tv_sec = pre_st.st_atime;
908+ tv[1].tv_usec = 0;
909+#endif
910 }
911
912 /* Open the file. */
98f2540e 913@@ -1691,7 +1707,7 @@ handle_elf (int fd, Elf *elf, const char
0dcd74c7
JR
914 /* If requested, preserve the timestamp. */
915 if (tvp != NULL)
916 {
917- if (futimes (fd, tvp) != 0)
918+ if (FUTIMES (fd, output_fname, tvp) != 0)
919 {
920 error (0, errno, gettext ("\
921 cannot set access and modification date of '%s'"),
98f2540e 922@@ -1748,7 +1764,7 @@ handle_ar (int fd, Elf *elf, const char
0dcd74c7
JR
923
924 if (tvp != NULL)
925 {
926- if (unlikely (futimes (fd, tvp) != 0))
927+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
928 {
929 error (0, errno, gettext ("\
930 cannot set access and modification date of '%s'"), fname);
49fd4b14
JB
931--- elfutils/tests/ChangeLog
932+++ elfutils/tests/ChangeLog
98f2540e 933@@ -373,6 +373,11 @@
49fd4b14
JB
934 * Makefile.am (TESTS): Add run-elflint-test.sh.
935 (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
936
937+2005-05-31 Roland McGrath <roland@redhat.com>
938+
939+ * Makefile.am (WEXTRA): New variable, substituted by configure.
940+ (AM_CFLAGS): Use it in place of -Wextra.
941+
942 2005-05-24 Ulrich Drepper <drepper@redhat.com>
943
944 * get-files.c (main): Use correct format specifier.
945--- elfutils/tests/Makefile.am
946+++ elfutils/tests/Makefile.am
98f2540e
JB
947@@ -25,12 +25,13 @@
948 ## <http://www.openinventionnetwork.com>.
49fd4b14
JB
949 ##
950 DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
951+WEXTRA = @WEXTRA@
952 if MUDFLAP
953-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
954+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
955 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
b4c3777d 956 BUILD_RPATH = \$$ORIGIN/../backends
49fd4b14
JB
957 else
958-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
959+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
960 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
b4c3777d 961 BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
49fd4b14 962 endif
0dcd74c7
JR
963--- elfutils/tests/Makefile.in
964+++ elfutils/tests/Makefile.in
bbcfe1b1 965@@ -287,6 +287,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
b4c3777d
JB
966 INSTALL_SCRIPT = @INSTALL_SCRIPT@
967 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
968 LDFLAGS = @LDFLAGS@
969+LD_AS_NEEDED = @LD_AS_NEEDED@
970 LEX = @LEX@
971 LEXLIB = @LEXLIB@
972 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
bbcfe1b1 973@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
b4c3777d 974 TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
0dcd74c7
JR
975 USE_NLS = @USE_NLS@
976 VERSION = @VERSION@
977+WEXTRA = @WEXTRA@
978 XGETTEXT = @XGETTEXT@
979 YACC = @YACC@
980 ac_ct_CC = @ac_ct_CC@
bbcfe1b1 981@@ -363,10 +365,10 @@ sbindir = @sbindir@
49fd4b14
JB
982 sharedstatedir = @sharedstatedir@
983 sysconfdir = @sysconfdir@
984 target_alias = @target_alias@
985-@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
986+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
987 @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
988
989-@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
990+@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
991 @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
992
b4c3777d 993 @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
This page took 0.273983 seconds and 4 git commands to generate.