]> git.pld-linux.org Git - packages/elfutils.git/blame - elfutils-portability.patch
- sh syntax fixes
[packages/elfutils.git] / elfutils-portability.patch
CommitLineData
0dcd74c7
JR
1--- elfutils/ChangeLog
2+++ elfutils/ChangeLog
49fd4b14
JB
3@@ -23,6 +23,17 @@
4 * Makefile.am (all_SUBDIRS): Add libdwfl.
5 * configure.ac: Write libdwfl/Makefile.
6
7+2005-05-31 Roland McGrath <roland@redhat.com>
0dcd74c7
JR
8+
9+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.
10+
49fd4b14
JB
11+ * configure.ac: Check for struct stat st_?tim members.
12+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.
0dcd74c7 13+
49fd4b14
JB
14+ * configure.ac: Check for futimes function.
15+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
16+ (handle_ar) [! HAVE_FUTIMES]: Likewise.
0dcd74c7 17+
49fd4b14 18 2005-05-19 Roland McGrath <roland@redhat.com>
0dcd74c7 19
49fd4b14 20 * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
0dcd74c7
JR
21--- elfutils/config/Makefile.in
22+++ elfutils/config/Makefile.in
49fd4b14 23@@ -113,6 +113,7 @@ SHELL = @SHELL@
0dcd74c7
JR
24 STRIP = @STRIP@
25 USE_NLS = @USE_NLS@
26 VERSION = @VERSION@
27+WEXTRA = @WEXTRA@
28 XGETTEXT = @XGETTEXT@
29 YACC = @YACC@
30 ac_ct_CC = @ac_ct_CC@
31--- elfutils/configure
32+++ elfutils/configure
49fd4b14 33@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.115'
0dcd74c7
JR
34 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
35
36 ac_unique_file="libelf/libelf.h"
49fd4b14
JB
37-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 LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
38+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 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 LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
0dcd74c7
JR
39 ac_subst_files=''
40
41 # Initialize some variables set by options.
49fd4b14 42@@ -3384,6 +3384,58 @@ echo "$as_me: error: gcc with C99 suppor
0dcd74c7
JR
43 fi
44
45
46+echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
47+echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6
48+if test "${ac_cv_cc_wextra+set}" = set; then
49+ echo $ECHO_N "(cached) $ECHO_C" >&6
50+else
51+ old_CFLAGS="$CFLAGS"
52+CFLAGS="$CFLAGS -Wextra"
53+cat >conftest.$ac_ext <<_ACEOF
54+void foo (void) { }
55+_ACEOF
56+rm -f conftest.$ac_objext
57+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
58+ (eval $ac_compile) 2>conftest.er1
59+ ac_status=$?
60+ grep -v '^ *+' conftest.er1 >conftest.err
61+ rm -f conftest.er1
62+ cat conftest.err >&5
63+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
64+ (exit $ac_status); } &&
65+ { ac_try='test -z "$ac_c_werror_flag"
66+ || test ! -s conftest.err'
67+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
68+ (eval $ac_try) 2>&5
69+ ac_status=$?
70+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
71+ (exit $ac_status); }; } &&
72+ { ac_try='test -s conftest.$ac_objext'
73+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
74+ (eval $ac_try) 2>&5
75+ ac_status=$?
76+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
77+ (exit $ac_status); }; }; then
78+ ac_cv_cc_wextra=yes
79+else
80+ echo "$as_me: failed program was:" >&5
81+sed 's/^/| /' conftest.$ac_ext >&5
82+
83+ac_cv_cc_wextra=no
84+fi
85+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
86+CFLAGS="$old_CFLAGS"
87+fi
88+echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
89+echo "${ECHO_T}$ac_cv_cc_wextra" >&6
90+
49fd4b14 91+if test "x$ac_cv_cc_wextra" = xyes; then
0dcd74c7
JR
92+ WEXTRA=-Wextra
93+else
94+ WEXTRA=-W
95+fi
96+
97+
98 LOCALEDIR=$datadir
99
100 cat >>confdefs.h <<_ACEOF
49fd4b14 101@@ -4925,6 +4977,7 @@ s,@YACC@,$YACC,;t t
0dcd74c7
JR
102 s,@LEX@,$LEX,;t t
103 s,@LEXLIB@,$LEXLIB,;t t
104 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
105+s,@WEXTRA@,$WEXTRA,;t t
106 s,@LOCALEDIR@,$LOCALEDIR,;t t
107 s,@DATADIRNAME@,$DATADIRNAME,;t t
108 s,@NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t
109--- elfutils/configure.ac
110+++ elfutils/configure.ac
49fd4b14 111@@ -69,6 +69,15 @@ CFLAGS="$old_CFLAGS"])
0dcd74c7
JR
112 AS_IF([test "x$ac_cv_c99" != xyes],
113 AC_MSG_ERROR([gcc with C99 support required]))
114
115+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
116+old_CFLAGS="$CFLAGS"
117+CFLAGS="$CFLAGS -Wextra"
118+AC_COMPILE_IFELSE([void foo (void) { }],
119+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
120+CFLAGS="$old_CFLAGS"])
121+AC_SUBST(WEXTRA)
49fd4b14 122+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
0dcd74c7
JR
123+
124 LOCALEDIR=$datadir
125 AC_SUBST(LOCALEDIR)
126 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
127--- elfutils/lib/ChangeLog
128+++ elfutils/lib/ChangeLog
49fd4b14 129@@ -12,6 +12,11 @@
0dcd74c7
JR
130 * Makefile.am (libeu_a_SOURCES): Add it.
131 * system.h: Declare crc32_file.
132
133+2005-02-07 Roland McGrath <roland@redhat.com>
134+
135+ * Makefile.am (WEXTRA): New variable, substituted by configure.
136+ (AM_CFLAGS): Use it in place of -Wextra.
137+
138 2005-04-30 Ulrich Drepper <drepper@redhat.com>
139
140 * Makefile.am: Use -ffunction-sections for xmalloc.c.
141--- elfutils/lib/Makefile.am
142+++ elfutils/lib/Makefile.am
143@@ -16,12 +16,13 @@
144 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
145 ##
146 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
147+WEXTRA = @WEXTRA@
148 if MUDFLAP
149 AM_CFLAGS = -fmudflap
150 else
151 AM_CFLAGS =
152 endif
153-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS)
154+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS)
155 INCLUDES = -I$(srcdir)/../libelf -I..
156
157 noinst_LIBRARIES = libeu.a
158--- elfutils/lib/Makefile.in
159+++ elfutils/lib/Makefile.in
49fd4b14 160@@ -135,6 +135,7 @@ SHELL = @SHELL@
0dcd74c7
JR
161 STRIP = @STRIP@
162 USE_NLS = @USE_NLS@
163 VERSION = @VERSION@
164+WEXTRA = @WEXTRA@
165 XGETTEXT = @XGETTEXT@
166 YACC = @YACC@
167 ac_ct_CC = @ac_ct_CC@
49fd4b14 168@@ -177,9 +178,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
169 sysconfdir = @sysconfdir@
170 target_alias = @target_alias@
171 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
172-@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS)
173+@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS)
174 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
175-@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS)
176+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS)
177 INCLUDES = -I$(srcdir)/../libelf -I..
178 noinst_LIBRARIES = libeu.a
179 libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
49fd4b14
JB
180--- elfutils/libasm/ChangeLog
181+++ elfutils/libasm/ChangeLog
182@@ -24,6 +24,11 @@
183 * asm_error.c: Add new error ASM_E_IOERROR.
184 * libasmP.h: Add ASM_E_IOERROR definition.
185
186+2005-05-31 Roland McGrath <roland@redhat.com>
187+
188+ * Makefile.am (WEXTRA): New variable, substituted by configure.
189+ (AM_CFLAGS): Use it in place of -Wextra.
190+
191 2005-02-15 Ulrich Drepper <drepper@redhat.com>
192
193 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
0dcd74c7
JR
194--- elfutils/libasm/Makefile.am
195+++ elfutils/libasm/Makefile.am
196@@ -13,12 +13,13 @@
197 ## 3001 King Ranch Road, Ukiah, CA 95482.
198 ##
199 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
200+WEXTRA = @WEXTRA@
201 if MUDFLAP
202 AM_CFLAGS = -fmudflap
203 else
204 AM_CFLAGS =
205 endif
49fd4b14
JB
206-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
207+AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
0dcd74c7
JR
208 INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
209 -I$(top_srcdir)/lib
210 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
211--- elfutils/libasm/Makefile.in
212+++ elfutils/libasm/Makefile.in
49fd4b14 213@@ -167,6 +167,7 @@ SHELL = @SHELL@
0dcd74c7
JR
214 STRIP = @STRIP@
215 USE_NLS = @USE_NLS@
216 VERSION = 1
217+WEXTRA = @WEXTRA@
218 XGETTEXT = @XGETTEXT@
219 YACC = @YACC@
220 ac_ct_CC = @ac_ct_CC@
49fd4b14 221@@ -209,9 +210,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
222 sysconfdir = @sysconfdir@
223 target_alias = @target_alias@
49fd4b14
JB
224 @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
225-@MUDFLAP_FALSE@ -Wextra -Wformat=2
226+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2
227 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
228-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2
229+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2
0dcd74c7
JR
230 INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
231 -I$(top_srcdir)/lib
232
233--- elfutils/libcpu/ChangeLog
234+++ elfutils/libcpu/ChangeLog
235@@ -1,3 +1,8 @@
236+2005-04-04 Roland McGrath <roland@redhat.com>
237+
238+ * Makefile.am (WEXTRA): New variable, substituted by configure.
239+ (AM_CFLAGS): Use it instead of -Wextra.
240+
241 2005-02-15 Ulrich Drepper <drepper@redhat.com>
242
243 * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
244--- elfutils/libcpu/Makefile.am
245+++ elfutils/libcpu/Makefile.am
246@@ -13,7 +13,8 @@
247 ## 3001 King Ranch Road, Ukiah, CA 95482.
248 ##
249 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
250-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
251+WEXTRA = @WEXTRA@
252+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
253 INCLUDES = -I$(srcdir)
254
255 noinst_LIBRARIES = libcpu_i386.a
256--- elfutils/libcpu/Makefile.in
257+++ elfutils/libcpu/Makefile.in
49fd4b14 258@@ -130,6 +130,7 @@ SHELL = @SHELL@
0dcd74c7
JR
259 STRIP = @STRIP@
260 USE_NLS = @USE_NLS@
261 VERSION = @VERSION@
262+WEXTRA = @WEXTRA@
263 XGETTEXT = @XGETTEXT@
264 YACC = @YACC@
265 ac_ct_CC = @ac_ct_CC@
49fd4b14 266@@ -171,7 +172,7 @@ sbindir = @sbindir@
0dcd74c7
JR
267 sharedstatedir = @sharedstatedir@
268 sysconfdir = @sysconfdir@
269 target_alias = @target_alias@
270-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
271+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
272 INCLUDES = -I$(srcdir)
273 noinst_LIBRARIES = libcpu_i386.a
274 libcpu_i386_a_SOURCES = i386_dis.c
49fd4b14
JB
275--- elfutils/libdw/ChangeLog
276+++ elfutils/libdw/ChangeLog
277@@ -140,6 +140,11 @@
278
279 2005-05-31 Roland McGrath <roland@redhat.com>
280
281+ * Makefile.am (WEXTRA): New variable, substituted by configure.
282+ (AM_CFLAGS): Use it in place of -Wextra.
283+
284+2005-05-31 Roland McGrath <roland@redhat.com>
285+
286 * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
287 formref offset.
288
0dcd74c7
JR
289--- elfutils/libdw/Makefile.am
290+++ elfutils/libdw/Makefile.am
291@@ -13,12 +13,13 @@
292 ## 3001 King Ranch Road, Ukiah, CA 95482.
293 ##
49fd4b14 294 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
0dcd74c7
JR
295+WEXTRA = @WEXTRA@
296 if MUDFLAP
297 AM_CFLAGS = -fmudflap
298 else
299 AM_CFLAGS =
300 endif
301-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
302+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
303 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
304 VERSION = 1
305
306--- elfutils/libdw/Makefile.in
307+++ elfutils/libdw/Makefile.in
49fd4b14 308@@ -207,6 +207,7 @@ SHELL = @SHELL@
0dcd74c7
JR
309 STRIP = @STRIP@
310 USE_NLS = @USE_NLS@
311 VERSION = 1
312+WEXTRA = @WEXTRA@
313 XGETTEXT = @XGETTEXT@
314 YACC = @YACC@
315 ac_ct_CC = @ac_ct_CC@
49fd4b14 316@@ -249,9 +250,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
317 sysconfdir = @sysconfdir@
318 target_alias = @target_alias@
319 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
320-@MUDFLAP_FALSE@ -Wextra -std=gnu99
321+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
322 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
323-@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99
324+@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99
325 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
49fd4b14
JB
326 COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
327 $(COMPILE)))
328--- elfutils/libdwfl/ChangeLog
329+++ elfutils/libdwfl/ChangeLog
330@@ -192,6 +192,11 @@
331
332 2005-07-21 Roland McGrath <roland@redhat.com>
333
334+ * Makefile.am (WEXTRA): New variable, substituted by configure.
335+ (AM_CFLAGS): Use it in place of -Wextra.
336+
337+2005-07-21 Roland McGrath <roland@redhat.com>
338+
339 * Makefile.am (noinst_HEADERS): Add loc2c.c.
340
341 * test2.c (main): Check sscanf result to quiet warning.
342--- elfutils/libdwfl/Makefile.am
343+++ elfutils/libdwfl/Makefile.am
344@@ -15,12 +15,13 @@
345 ## 3001 King Ranch Road, Ukiah, CA 95482.
346 ##
347 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
348+WEXTRA = @WEXTRA@
349 if MUDFLAP
350 AM_CFLAGS = -fmudflap
351 else
352 AM_CFLAGS =
353 endif
354-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
355+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
356 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
357 -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
358 VERSION = 1
359--- elfutils/libdwfl/Makefile.in
360+++ elfutils/libdwfl/Makefile.in
361@@ -163,6 +163,7 @@ SHELL = @SHELL@
362 STRIP = @STRIP@
363 USE_NLS = @USE_NLS@
364 VERSION = 1
365+WEXTRA = @WEXTRA@
366 XGETTEXT = @XGETTEXT@
367 YACC = @YACC@
368 ac_ct_CC = @ac_ct_CC@
369@@ -205,9 +206,9 @@ sharedstatedir = @sharedstatedir@
370 sysconfdir = @sysconfdir@
371 target_alias = @target_alias@
372 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
373-@MUDFLAP_FALSE@ -Wextra -std=gnu99
374+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
375 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
376-@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99
377+@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99
378 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
379 -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib
380
381--- elfutils/libebl/ChangeLog
382+++ elfutils/libebl/ChangeLog
383@@ -152,6 +152,11 @@
384 * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
385 tracking works right.
386
387+2005-05-31 Roland McGrath <roland@redhat.com>
388+
389+ * Makefile.am (WEXTRA): New variable, substituted by configure.
390+ (AM_CFLAGS): Use it in place of -Wextra.
391+
392 2005-05-21 Ulrich Drepper <drepper@redhat.com>
393
394 * libebl_x86_64.map: Add x86_64_core_note.
0dcd74c7
JR
395--- elfutils/libebl/Makefile.am
396+++ elfutils/libebl/Makefile.am
397@@ -13,12 +13,13 @@
398 ## 3001 King Ranch Road, Ukiah, CA 95482.
399 ##
400 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
401+WEXTRA = @WEXTRA@
402 if MUDFLAP
403 AM_CFLAGS = -fmudflap
404 else
405 AM_CFLAGS =
406 endif
407-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
408+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
409 -std=gnu99
410
411 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
412--- elfutils/libebl/Makefile.in
413+++ elfutils/libebl/Makefile.in
49fd4b14 414@@ -258,6 +258,7 @@ SHELL = @SHELL@
0dcd74c7
JR
415 STRIP = @STRIP@
416 USE_NLS = @USE_NLS@
417 VERSION = 1
418+WEXTRA = @WEXTRA@
419 XGETTEXT = @XGETTEXT@
420 YACC = @YACC@
421 ac_ct_CC = @ac_ct_CC@
49fd4b14 422@@ -300,9 +301,9 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
423 sysconfdir = @sysconfdir@
424 target_alias = @target_alias@
425 @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
426-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
427+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
428 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
429-@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99
430+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99
431 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
432 lib_LIBRARIES = libebl.a
49fd4b14
JB
433 modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64
434--- elfutils/libelf/ChangeLog
435+++ elfutils/libelf/ChangeLog
436@@ -86,6 +86,11 @@
437 If section content hasn't been read yet, do it before looking for the
438 block size. If no section data present, infer size of section header.
439
440+2005-05-31 Roland McGrath <roland@redhat.com>
441+
442+ * Makefile.am (WEXTRA): New variable, substituted by configure.
443+ (AM_CFLAGS): Use it in place of -Wextra.
444+
445 2005-05-11 Ulrich Drepper <drepper@redhat.com>
446
447 * elf.h: Update again.
448--- elfutils/libelf/common.h
449+++ elfutils/libelf/common.h
450@@ -122,7 +122,7 @@ libelf_release_all (Elf *elf)
451 (Var) = (sizeof (Var) == 1 \
452 ? (unsigned char) (Var) \
453 : (sizeof (Var) == 2 \
454- ? bswap_16 (Var) \
455+ ? (unsigned short int) bswap_16 (Var) \
456 : (sizeof (Var) == 4 \
457 ? bswap_32 (Var) \
458 : bswap_64 (Var))))
459@@ -131,7 +131,7 @@ libelf_release_all (Elf *elf)
460 (Dst) = (sizeof (Var) == 1 \
461 ? (unsigned char) (Var) \
462 : (sizeof (Var) == 2 \
463- ? bswap_16 (Var) \
464+ ? (unsigned short int) bswap_16 (Var) \
465 : (sizeof (Var) == 4 \
466 ? bswap_32 (Var) \
467 : bswap_64 (Var))))
0dcd74c7
JR
468--- elfutils/libelf/Makefile.am
469+++ elfutils/libelf/Makefile.am
49fd4b14 470@@ -16,6 +16,7 @@
0dcd74c7
JR
471 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
472 ##
473 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H
474+WEXTRA = @WEXTRA@
475 if MUDFLAP
49fd4b14 476 AM_CFLAGS = -fmudflap
0dcd74c7 477 else
49fd4b14
JB
478@@ -24,7 +25,10 @@ endif
479 if BUILD_STATIC
480 AM_CFLAGS += -fpic
0dcd74c7
JR
481 endif
482-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
49fd4b14
JB
483+if BUILD_STATIC
484+AM_CFLAGS += -fpic
485+endif
0dcd74c7
JR
486+AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
487 $($(*F)_CFLAGS)
488 INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
489 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
490--- elfutils/libelf/Makefile.in
491+++ elfutils/libelf/Makefile.in
49fd4b14
JB
492@@ -40,7 +40,7 @@ PRE_UNINSTALL = :
493 POST_UNINSTALL = :
494 build_triplet = @build@
495 host_triplet = @host@
496-@BUILD_STATIC_TRUE@am__append_1 = -fpic
497+@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic
498 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
499 @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
500 subdir = libelf
501@@ -210,6 +210,7 @@ SHELL = @SHELL@
0dcd74c7
JR
502 STRIP = @STRIP@
503 USE_NLS = @USE_NLS@
504 VERSION = 1
505+WEXTRA = @WEXTRA@
506 XGETTEXT = @XGETTEXT@
507 YACC = @YACC@
508 ac_ct_CC = @ac_ct_CC@
49fd4b14 509@@ -252,10 +253,10 @@ sharedstatedir = @sharedstatedir@
0dcd74c7
JR
510 sysconfdir = @sysconfdir@
511 target_alias = @target_alias@
49fd4b14
JB
512 @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
513-@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \
514+@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
515 @MUDFLAP_FALSE@ $($(*F)_CFLAGS)
516 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \
517-@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \
518+@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
0dcd74c7
JR
519 @MUDFLAP_TRUE@ $($(*F)_CFLAGS)
520 INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
521 GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
522--- elfutils/m4/Makefile.in
523+++ elfutils/m4/Makefile.in
49fd4b14 524@@ -111,6 +111,7 @@ SHELL = @SHELL@
0dcd74c7
JR
525 STRIP = @STRIP@
526 USE_NLS = @USE_NLS@
527 VERSION = @VERSION@
528+WEXTRA = @WEXTRA@
529 XGETTEXT = @XGETTEXT@
530 YACC = @YACC@
531 ac_ct_CC = @ac_ct_CC@
49fd4b14
JB
532--- elfutils/Makefile.in
533+++ elfutils/Makefile.in
534@@ -135,6 +135,7 @@ SHELL = @SHELL@
0dcd74c7
JR
535 STRIP = @STRIP@
536 USE_NLS = @USE_NLS@
537 VERSION = @VERSION@
538+WEXTRA = @WEXTRA@
539 XGETTEXT = @XGETTEXT@
49fd4b14 540 YACC = @YACC@
0dcd74c7 541 ac_ct_CC = @ac_ct_CC@
49fd4b14
JB
542--- elfutils/src/ChangeLog
543+++ elfutils/src/ChangeLog
544@@ -216,6 +216,11 @@
545 * readelf.c (print_debug_loc_section): Fix indentation for larger
546 address size.
0dcd74c7 547
49fd4b14
JB
548+2005-05-31 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-05-30 Roland McGrath <roland@redhat.com>
0dcd74c7 554
49fd4b14 555 * readelf.c (print_debug_line_section): Print section offset of each
0dcd74c7
JR
556--- elfutils/src/findtextrel.c
557+++ elfutils/src/findtextrel.c
558@@ -476,7 +476,11 @@ ptrcompare (const void *p1, const void *
559
560
561 static void
562-check_rel (size_t nsegments, struct segments segments[nsegments],
563+check_rel (size_t nsegments, struct segments segments[
564+#if __GNUC__ >= 4
565+ nsegments
566+#endif
567+ ],
568 GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
569 const char *fname, bool more_than_one, void **knownsrcs)
570 {
49fd4b14
JB
571--- elfutils/src/Makefile.am
572+++ elfutils/src/Makefile.am
573@@ -14,6 +14,7 @@
574 ##
575 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
576 -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
577+WEXTRA = @WEXTRA@
578 if MUDFLAP
579 AM_CFLAGS = -fmudflap
580 else
581@@ -21,7 +22,7 @@ AM_CFLAGS =
582 endif
583 AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
584 $(if $($(*F)_no_Werror),,-Werror) \
585- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
586+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
587 $(if $($(*F)_no_Wformat),,-Wformat=2)
588
589 INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
590--- elfutils/src/Makefile.in
591+++ elfutils/src/Makefile.in
592@@ -221,6 +221,7 @@ SHELL = @SHELL@
593 STRIP = @STRIP@
594 USE_NLS = @USE_NLS@
595 VERSION = @VERSION@
596+WEXTRA = @WEXTRA@
597 XGETTEXT = @XGETTEXT@
598 YACC = @YACC@ -d
599 ac_ct_CC = @ac_ct_CC@
600@@ -265,12 +266,12 @@ target_alias = @target_alias@
601 @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
602 @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
603 @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
604-@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
605+@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
606 @MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2)
607 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
608 @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \
609 @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \
610-@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
611+@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
612 @MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2)
613 INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
614 -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
0dcd74c7
JR
615--- elfutils/src/strip.c
616+++ elfutils/src/strip.c
617@@ -40,6 +40,12 @@
618 #include <libebl.h>
619 #include <system.h>
620
621+#ifdef HAVE_FUTIMES
622+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
623+#else
624+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
625+#endif
626+
627
628 /* Name and version of program. */
629 static void print_version (FILE *stream, struct argp_state *state);
49fd4b14 630@@ -288,8 +294,18 @@ process_file (const char *fname)
0dcd74c7
JR
631
632 /* If we have to preserve the timestamp, we need it in the
633 format utimes() understands. */
634+#ifdef HAVE_STRUCT_STAT_ST_ATIM
635 TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
636+#else
637+ tv[0].tv_sec = pre_st.st_atime;
638+ tv[0].tv_usec = 0;
639+#endif
640+#ifdef HAVE_STRUCT_STAT_ST_MTIM
641 TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
642+#else
643+ tv[1].tv_sec = pre_st.st_atime;
644+ tv[1].tv_usec = 0;
645+#endif
646 }
647
648 /* Open the file. */
49fd4b14 649@@ -1679,7 +1695,7 @@ handle_elf (int fd, Elf *elf, const char
0dcd74c7
JR
650 /* If requested, preserve the timestamp. */
651 if (tvp != NULL)
652 {
653- if (futimes (fd, tvp) != 0)
654+ if (FUTIMES (fd, output_fname, tvp) != 0)
655 {
656 error (0, errno, gettext ("\
657 cannot set access and modification date of '%s'"),
49fd4b14 658@@ -1736,7 +1752,7 @@ handle_ar (int fd, Elf *elf, const char
0dcd74c7
JR
659
660 if (tvp != NULL)
661 {
662- if (unlikely (futimes (fd, tvp) != 0))
663+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
664 {
665 error (0, errno, gettext ("\
666 cannot set access and modification date of '%s'"), fname);
49fd4b14
JB
667--- elfutils/tests/ChangeLog
668+++ elfutils/tests/ChangeLog
669@@ -161,6 +161,11 @@
670 * Makefile.am (TESTS): Add run-elflint-test.sh.
671 (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
672
673+2005-05-31 Roland McGrath <roland@redhat.com>
674+
675+ * Makefile.am (WEXTRA): New variable, substituted by configure.
676+ (AM_CFLAGS): Use it in place of -Wextra.
677+
678 2005-05-24 Ulrich Drepper <drepper@redhat.com>
679
680 * get-files.c (main): Use correct format specifier.
681--- elfutils/tests/Makefile.am
682+++ elfutils/tests/Makefile.am
683@@ -13,12 +13,13 @@
684 ## 3001 King Ranch Road, Ukiah, CA 95482.
685 ##
686 DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
687+WEXTRA = @WEXTRA@
688 if MUDFLAP
689-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
690+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
691 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
692 AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libebl
693 else
694-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
695+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
696 $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
697 AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
698 endif
0dcd74c7
JR
699--- elfutils/tests/Makefile.in
700+++ elfutils/tests/Makefile.in
49fd4b14 701@@ -287,6 +287,7 @@ SHELL = @SHELL@
0dcd74c7
JR
702 STRIP = @STRIP@
703 USE_NLS = @USE_NLS@
704 VERSION = @VERSION@
705+WEXTRA = @WEXTRA@
706 XGETTEXT = @XGETTEXT@
707 YACC = @YACC@
708 ac_ct_CC = @ac_ct_CC@
49fd4b14
JB
709@@ -328,10 +329,10 @@ sbindir = @sbindir@
710 sharedstatedir = @sharedstatedir@
711 sysconfdir = @sysconfdir@
712 target_alias = @target_alias@
713-@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
714+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
715 @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
716
717-@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
718+@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
719 @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
720
721 @MUDFLAP_FALSE@AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
This page took 0.147334 seconds and 4 git commands to generate.