--- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog @@ -57,6 +57,10 @@ * ppc_attrs.c (ppc_check_object_attribute): Handle tag GNU_Power_ABI_Struct_Return. +2009-01-23 Roland McGrath + + * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED). + 2008-10-04 Ulrich Drepper * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and @@ -384,6 +388,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. +2005-11-22 Roland McGrath + + * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure. + (libebl_%.so rule): Use it in place of -Wl,--as-needed. + 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. @@ -406,6 +415,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + * ppc_reloc.def: Update bits per Alan Modra . * ppc64_reloc.def: Likewise. --- elfutils/backends/Makefile.am +++ elfutils/backends/Makefile.am @@ -25,12 +25,14 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" +WEXTRA = @WEXTRA@ +LD_AS_NEEDED = @LD_AS_NEEDED@ if MUDFLAP AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ -std=gnu99 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ @@ -115,7 +117,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ -Wl,--version-script,$(word 2,$^) \ - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) + -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) $(textrel_check) # XXX Should not be needed... --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in @@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -192,6 +193,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -250,9 +252,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. @@ -680,7 +682,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map $(LINK) -shared -o $@ -Wl,--whole-archive,$<\ $(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \ -Wl,--version-script,$(word 2,$^) \ - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) + -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) $(textrel_check) # XXX Should not be needed... --- elfutils/ChangeLog +++ elfutils/ChangeLog @@ -6,6 +6,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. +2009-08-17 Roland McGrath + + * configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works. + 2009-04-19 Roland McGrath * configure.ac (eu_version): Round down here, not in version.h macros. @@ -17,6 +21,8 @@ 2009-01-23 Roland McGrath + * configure.ac: Check for __builtin_popcount. + * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of @@ -97,6 +103,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. +2005-11-22 Roland McGrath + + * configure.ac: Check for --as-needed linker option. + 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. @@ -144,6 +154,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. +2005-05-31 Roland McGrath + + * configure.ac (WEXTRA): Check for -Wextra and set this substitution. + + * configure.ac: Check for struct stat st_?tim members. + * src/strip.c (process_file): Use st_?time if st_?tim are not there. + + * configure.ac: Check for futimes function. + * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead. + (handle_ar) [! HAVE_FUTIMES]: Likewise. + 2005-05-19 Roland McGrath * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in @@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -105,6 +106,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ --- elfutils/config.h.in +++ elfutils/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Have __builtin_popcount. */ +#undef HAVE_BUILTIN_POPCOUNT + /* $libdir subdirectory containing libebl modules. */ #undef LIBEBL_SUBDIR @@ -55,4 +58,7 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* Stubbed out if missing compiler support. */ +#undef __thread + #include --- elfutils/configure +++ elfutils/configure @@ -646,6 +646,8 @@ NATIVE_LD_FALSE NATIVE_LD_TRUE DATADIRNAME LOCALEDIR +LD_AS_NEEDED +WEXTRA LEXLIB LEX_OUTPUT_ROOT LEX @@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su fi +{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5 +$as_echo_n "checking for -Wextra option to $CC... " >&6; } +if test "${ac_cv_cc_wextra+set}" = set; then + $as_echo_n "(cached) " >&6 +else + old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wextra" +cat >conftest.$ac_ext <<_ACEOF +void foo (void) { } +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_cc_wextra=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_cc_wextra=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$old_CFLAGS" +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5 +$as_echo "$ac_cv_cc_wextra" >&6; } + +if test "x$ac_cv_cc_wextra" = xyes; then + WEXTRA=-Wextra +else + WEXTRA=-W +fi + + +{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5 +$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; } +if test "${ac_cv_cc_gnu89_inline+set}" = set; then + $as_echo_n "(cached) " >&6 +else + old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fgnu89-inline -Werror" +cat >conftest.$ac_ext <<_ACEOF + +void foo (void) +{ + inline void bar (void) {} + bar (); +} +extern inline void baz (void) {} + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_cc_gnu89_inline=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_cc_gnu89_inline=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$old_CFLAGS" +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_gnu89_inline" >&5 +$as_echo "$ac_cv_cc_gnu89_inline" >&6; } +if test "x$ac_cv_cc_gnu89_inline" = xyes; then + WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline" +fi + + +{ $as_echo "$as_me:$LINENO: checking for --as-needed linker option" >&5 +$as_echo_n "checking for --as-needed linker option... " >&6; } +if test "${ac_cv_as_needed+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } +then + ac_cv_as_needed=yes +else + ac_cv_as_needed=no +fi +rm -f conftest* +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5 +$as_echo "$ac_cv_as_needed" >&6; } +if test "x$ac_cv_as_needed" = xyes; then + LD_AS_NEEDED=-Wl,--as-needed +else + LD_AS_NEEDED= +fi + + + +{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5 +$as_echo_n "checking for __builtin_popcount... " >&6; } +if test "${ac_cv_popcount+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +exit (__builtin_popcount (127)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_popcount=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_popcount=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5 +$as_echo "$ac_cv_popcount" >&6; } +if test "x$ac_cv_popcount" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BUILTIN_POPCOUNT 1 +_ACEOF + +fi + + { $as_echo "$as_me:$LINENO: checking for __thread support" >&5 $as_echo_n "checking for __thread support... " >&6; } if test "${ac_cv_tls+set}" = set; then @@ -4163,9 +4364,18 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5 $as_echo "$ac_cv_tls" >&6; } if test "x$ac_cv_tls" != xyes; then - { { $as_echo "$as_me:$LINENO: error: __thread support required" >&5 -$as_echo "$as_me: error: __thread support required" >&2;} + if test "$use_locks" = yes; then + { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5 +$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;} { (exit 1); exit 1; }; } +else + +cat >>confdefs.h <<\_ACEOF +#define __thread /* empty: no multi-thread support */ +_ACEOF + +fi + fi --- elfutils/configure.ac +++ elfutils/configure.ac @@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"]) AS_IF([test "x$ac_cv_c99" != xyes], AC_MSG_ERROR([gcc with C99 support required])) +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl +old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wextra" +AC_COMPILE_IFELSE([void foo (void) { }], + ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no) +CFLAGS="$old_CFLAGS"]) +AC_SUBST(WEXTRA) +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W]) + +AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl +old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fgnu89-inline -Werror" +AC_COMPILE_IFELSE([ +void foo (void) +{ + inline void bar (void) {} + bar (); +} +extern inline void baz (void) {} +], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no) +CFLAGS="$old_CFLAGS"]) +AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes], + [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"]) + +AC_CACHE_CHECK([for --as-needed linker option], + ac_cv_as_needed, [dnl +cat > conftest.c <&AS_MESSAGE_LOG_FD]) +then + ac_cv_as_needed=yes +else + ac_cv_as_needed=no +fi +rm -f conftest*]) +AS_IF([test "x$ac_cv_as_needed" = xyes], + [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=]) +AC_SUBST(LD_AS_NEEDED) + +AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl +AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])], + ac_cv_popcount=yes, ac_cv_popcount=no)]) +AS_IF([test "x$ac_cv_popcount" = xyes], + [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])]) + AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl # Use the same flags that we use for our DSOs, so the test is representative. # Some old compiler/linker/libc combinations fail some ways and not others. @@ -88,7 +136,10 @@ static __thread int a; int foo (int b) { CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"]) AS_IF([test "x$ac_cv_tls" != xyes], - AC_MSG_ERROR([__thread support required])) + [AS_IF([test "$use_locks" = yes], + [AC_MSG_ERROR([--enable-thread-safety requires __thread support])], + [AC_DEFINE([__thread], [/* empty: no multi-thread support */], + [Stubbed out if missing compiler support.])])]) LOCALEDIR=$datadir AC_SUBST(LOCALEDIR) --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog @@ -4,6 +4,9 @@ 2009-01-23 Roland McGrath + * eu-config.h [! HAVE_BUILTIN_POPCOUNT] + (__builtin_popcount): New inline function. + * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper @@ -60,6 +63,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. +2005-02-07 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-04-30 Ulrich Drepper * Makefile.am: Use -ffunction-sections for xmalloc.c. --- elfutils/lib/eu-config.h +++ elfutils/lib/eu-config.h @@ -182,6 +182,17 @@ asm (".section predict_data, \"aw\"; .pr /* This macro is used by the tests conditionalize for standalone building. */ #define ELFUTILS_HEADER(name) +#ifndef HAVE_BUILTIN_POPCOUNT +# define __builtin_popcount hakmem_popcount +static inline unsigned int __attribute__ ((unused)) +hakmem_popcount (unsigned int x) +{ + /* HAKMEM 169 */ + unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111); + return ((n + (n >> 3)) & 030707070707) % 63; +} +#endif /* HAVE_BUILTIN_POPCOUNT */ + #ifdef SHARED # define OLD_VERSION(name, version) \ --- elfutils/lib/Makefile.am +++ elfutils/lib/Makefile.am @@ -25,12 +25,13 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS) INCLUDES = -I$(srcdir)/../libelf -I.. noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in @@ -98,6 +98,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -127,6 +128,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -185,9 +187,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS) +@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS) @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS) +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS) INCLUDES = -I$(srcdir)/../libelf -I.. noinst_LIBRARIES = libeu.a libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \ --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog @@ -63,6 +63,11 @@ * asm_error.c: Add new error ASM_E_IOERROR. * libasmP.h: Add ASM_E_IOERROR definition. +2005-05-31 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-02-15 Ulrich Drepper * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. --- elfutils/libasm/Makefile.am +++ elfutils/libasm/Makefile.am @@ -25,12 +25,13 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 +AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 INCLUDES = -I. -I$(srcdir) -I.. \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ -I$(top_srcdir)/lib --- elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in @@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -174,6 +175,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -232,9 +234,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 INCLUDES = -I. -I$(srcdir) -I.. \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ -I$(top_srcdir)/lib --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog @@ -5,6 +5,9 @@ 2009-01-23 Roland McGrath + * i386_disasm.c (i386_disasm): Add abort after assert-constant for old + compilers that don't realize it's noreturn. + * Makefile.am (i386_parse_CFLAGS): Use quotes around command substitution that can produce leading whitespace. @@ -334,6 +337,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. +2005-04-04 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it instead of -Wextra. + 2005-02-15 Ulrich Drepper * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. --- elfutils/libcpu/i386_disasm.c +++ elfutils/libcpu/i386_disasm.c @@ -791,6 +791,7 @@ i386_disasm (const uint8_t **startp, con default: assert (! "INVALID not handled"); + abort (); } } else --- elfutils/libcpu/Makefile.am +++ elfutils/libcpu/Makefile.am @@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \ +WEXTRA = @WEXTRA@ +AM_CFLAGS += -Wall -Wshadow -Wunused $(WEXTRA) -std=gnu99 -fpic \ -fdollars-in-identifiers \ $($(*F)_CFLAGS) \ $(if $($(*F)_no_Werror),,-Werror) --- elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in @@ -114,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( + + * libdw.h: Disable extern inlines for GCC 4.2. + 2009-08-10 Roland McGrath * dwarf_getscopevar.c: Use dwarf_diename. @@ -788,6 +792,11 @@ 2005-05-31 Roland McGrath + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + +2005-05-31 Roland McGrath + * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to formref offset. --- elfutils/libdw/libdw.h +++ elfutils/libdw/libdw.h @@ -809,7 +809,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( /* Inline optimizations. */ -#ifdef __OPTIMIZE__ +#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2) /* Return attribute code of given attribute. */ __libdw_extern_inline unsigned int dwarf_whatattr (Dwarf_Attribute *attr) --- elfutils/libdw/Makefile.am +++ elfutils/libdw/Makefile.am @@ -25,6 +25,7 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else @@ -33,7 +34,7 @@ endif if BUILD_STATIC AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib VERSION = 1 --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in @@ -186,6 +186,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -215,6 +216,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -273,9 +275,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ -@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99 +@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \ -@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 +@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \ +@MUDFLAP_TRUE@ -std=gnu99 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog @@ -1139,6 +1139,11 @@ 2005-07-21 Roland McGrath + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + +2005-07-21 Roland McGrath + * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. --- elfutils/libdwfl/Makefile.am +++ elfutils/libdwfl/Makefile.am @@ -27,12 +27,13 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib VERSION = 1 --- elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in @@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -208,6 +209,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -266,9 +268,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ -@MUDFLAP_FALSE@ -Wextra -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \ -@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99 +@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog @@ -603,6 +603,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. +2005-05-31 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-05-21 Ulrich Drepper * libebl_x86_64.map: Add x86_64_core_note. --- elfutils/libebl/Makefile.am +++ elfutils/libebl/Makefile.am @@ -25,12 +25,13 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else AM_CFLAGS = endif -AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ -std=gnu99 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in @@ -141,6 +141,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -170,6 +171,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -228,9 +230,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ -@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 +@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. -I$(srcdir)/../libasm --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog @@ -580,6 +580,11 @@ * elf.h: Update from glibc. +2005-05-31 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-05-08 Roland McGrath * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now. --- elfutils/libelf/common.h +++ elfutils/libelf/common.h @@ -160,7 +160,7 @@ libelf_release_all (Elf *elf) (Var) = (sizeof (Var) == 1 \ ? (unsigned char) (Var) \ : (sizeof (Var) == 2 \ - ? bswap_16 (Var) \ + ? (unsigned short int) bswap_16 (Var) \ : (sizeof (Var) == 4 \ ? bswap_32 (Var) \ : bswap_64 (Var)))) @@ -169,7 +169,7 @@ libelf_release_all (Elf *elf) (Dst) = (sizeof (Var) == 1 \ ? (unsigned char) (Var) \ : (sizeof (Var) == 2 \ - ? bswap_16 (Var) \ + ? (unsigned short int) bswap_16 (Var) \ : (sizeof (Var) == 4 \ ? bswap_32 (Var) \ : bswap_64 (Var)))) --- elfutils/libelf/Makefile.am +++ elfutils/libelf/Makefile.am @@ -25,6 +25,7 @@ ## . ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else @@ -33,7 +34,7 @@ endif if BUILD_STATIC AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ +AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ $($(*F)_CFLAGS) INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) --- elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in @@ -188,6 +188,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -217,6 +218,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -275,10 +277,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \ -@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \ +@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ @MUDFLAP_FALSE@ $($(*F)_CFLAGS) @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \ -@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ +@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ @MUDFLAP_TRUE@ $($(*F)_CFLAGS) INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in @@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -104,6 +105,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ --- elfutils/Makefile.in +++ elfutils/Makefile.in @@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -184,6 +185,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ --- elfutils/src/addr2line.c +++ elfutils/src/addr2line.c @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl bool parsed = false; int n; char *name = NULL; - if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2 + if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2 && string[n] == '\0') parsed = adjust_to_section (name, &addr, dwfl); - else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 + else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2 && string[n] == '\0') { /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog @@ -7,8 +7,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. +2009-08-17 Roland McGrath + + * ld.h: Disable extern inlines for GCC 4.2. + 2009-08-14 Roland McGrath + * strings.c (read_block): Conditionalize posix_fadvise use + on [POSIX_FADV_SEQUENTIAL]. + From Petr Salinger . + * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper @@ -172,6 +180,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. + * addr2line.c (handle_address): Use %a instead of %m for compatibility. + 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section @@ -355,6 +365,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. +2008-03-01 Roland McGrath + + * readelf.c (dump_archive_index): Tweak portability hack + to match [__GNUC__ < 4] too. + 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. @@ -606,6 +621,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. + * Makefile.am (readelf_no_Werror): New variable. + 2007-10-15 Roland McGrath * make-debug-archive.in: New file. @@ -1045,6 +1062,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . + * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to + MADV_SEQUENTIAL if undefined. Don't call posix_madvise + if neither is defined. + 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. @@ -1121,6 +1142,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. +2006-04-05 Roland McGrath + + * strings.c (MAP_POPULATE): Define to 0 if undefined. + 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp @@ -1469,6 +1494,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. +2005-05-31 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-05-30 Roland McGrath * readelf.c (print_debug_line_section): Print section offset of each --- elfutils/src/findtextrel.c +++ elfutils/src/findtextrel.c @@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void * static void -check_rel (size_t nsegments, struct segments segments[nsegments], +check_rel (size_t nsegments, struct segments segments[ +#if __GNUC__ >= 4 + nsegments +#endif + ], GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw, const char *fname, bool more_than_one, void **knownsrcs) { --- elfutils/src/ld.h +++ elfutils/src/ld.h @@ -1122,6 +1122,7 @@ extern bool dynamically_linked_p (void); /* Checked whether the symbol is undefined and referenced from a DSO. */ extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx); +#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2) #ifdef __GNUC_STDC_INLINE__ __attribute__ ((__gnu_inline__)) #endif @@ -1139,5 +1140,6 @@ linked_from_dso_p (struct scninfo *scnin return sym->defined && sym->in_dso; } +#endif /* Optimizing and not GCC 4.2. */ #endif /* ld.h */ --- elfutils/src/Makefile.am +++ elfutils/src/Makefile.am @@ -26,6 +26,7 @@ ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \ -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" +WEXTRA = @WEXTRA@ if MUDFLAP AM_CFLAGS = -fmudflap else @@ -33,7 +34,7 @@ AM_CFLAGS = endif AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(CFLAGS_$(*F)) INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ @@ -112,6 +113,9 @@ addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this ldgeneric_no_Wunused = yes +# Buggy old compilers. +readelf_no_Werror = yes + readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in @@ -226,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -255,6 +256,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -d @@ -315,13 +317,13 @@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \ @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \ @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \ -@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ +@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ @MUDFLAP_FALSE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ @MUDFLAP_FALSE@ $(CFLAGS_$(*F)) @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \ @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \ @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \ -@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ +@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ @MUDFLAP_TRUE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ @MUDFLAP_TRUE@ $(CFLAGS_$(*F)) INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ @@ -367,6 +369,9 @@ strings_no_Wformat = yes addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this ldgeneric_no_Wunused = yes + +# Buggy old compilers. +readelf_no_Werror = yes readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c @@ -7594,7 +7594,7 @@ dump_archive_index (Elf *elf, const char if (unlikely (elf_rand (elf, as_off) == 0) || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) == NULL)) -#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) +#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4 while (1) #endif error (EXIT_FAILURE, 0, --- elfutils/src/strings.c +++ elfutils/src/strings.c @@ -51,6 +51,10 @@ #include +#ifndef MAP_POPULATE +# define MAP_POPULATE 0 +#endif + /* Prototypes of local functions. */ static int read_fd (int fd, const char *fname, off64_t fdlen); @@ -491,8 +495,13 @@ map_file (int fd, off64_t start_off, off fd, start_off); if (mem != MAP_FAILED) { +#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL +# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL +#endif +#ifdef POSIX_MADV_SEQUENTIAL /* We will go through the mapping sequentially. */ (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL); +#endif break; } if (errno != EINVAL && errno != ENOMEM) @@ -586,9 +595,11 @@ read_block (int fd, const char *fname, o elfmap_off = from & ~(ps - 1); elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size); +#ifdef POSIX_FADV_SEQUENTIAL if (unlikely (elfmap == MAP_FAILED)) /* Let the kernel know we are going to read everything in sequence. */ (void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL); +#endif } if (unlikely (elfmap == MAP_FAILED)) --- elfutils/src/strip.c +++ elfutils/src/strip.c @@ -52,6 +52,12 @@ #include #include +#ifdef HAVE_FUTIMES +# define FUTIMES(fd, fname, tvp) futimes (fd, tvp) +#else +# define FUTIMES(fd, fname, tvp) utimes (fname, tvp) +#endif + /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); @@ -300,8 +306,18 @@ process_file (const char *fname) /* If we have to preserve the timestamp, we need it in the format utimes() understands. */ +#ifdef HAVE_STRUCT_STAT_ST_ATIM TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim); +#else + tv[0].tv_sec = pre_st.st_atime; + tv[0].tv_usec = 0; +#endif +#ifdef HAVE_STRUCT_STAT_ST_MTIM TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim); +#else + tv[1].tv_sec = pre_st.st_atime; + tv[1].tv_usec = 0; +#endif } /* Open the file. */ @@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char /* If requested, preserve the timestamp. */ if (tvp != NULL) { - if (futimes (fd, tvp) != 0) + if (FUTIMES (fd, output_fname, tvp) != 0) { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), @@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char if (tvp != NULL) { - if (unlikely (futimes (fd, tvp) != 0)) + if (unlikely (FUTIMES (fd, fname, tvp) != 0)) { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog @@ -124,6 +124,8 @@ 2008-01-21 Roland McGrath + * line2addr.c (main): Revert last change. + * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. @@ -832,6 +834,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. +2005-05-31 Roland McGrath + + * Makefile.am (WEXTRA): New variable, substituted by configure. + (AM_CFLAGS): Use it in place of -Wextra. + 2005-05-24 Ulrich Drepper * get-files.c (main): Use correct format specifier. --- elfutils/tests/line2addr.c +++ elfutils/tests/line2addr.c @@ -132,7 +132,7 @@ main (int argc, char *argv[]) { struct args a = { .arg = argv[cnt] }; - switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line)) + switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line)) { default: case 0: --- elfutils/tests/Makefile.am +++ elfutils/tests/Makefile.am @@ -25,12 +25,13 @@ ## . ## DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE +WEXTRA = @WEXTRA@ if MUDFLAP -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILD_RPATH = \$$ORIGIN/../backends else -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in @@ -359,6 +359,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LD_AS_NEEDED = @LD_AS_NEEDED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ @@ -388,6 +389,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ @@ -445,10 +447,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ +@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) -@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ +@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends