rpms/elfutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.128

Browse Source
This commit is contained in:
roland 2007-06-08 21:20:58 +00:00
parent 24b053bc0c
commit 3cb5dfbacf
4 changed files with 230 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

298
elfutils-portability.patch
View File

@ -1,6 +1,6 @@
--- elfutils/backends/ChangeLog --- elfutils/backends/ChangeLog
+++ elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog
@@ -135,6 +135,11 @@ @@ -157,6 +157,11 @@
* sparc_init.c: Likewise. * sparc_init.c: Likewise.
* x86_64_init.c: Likewise. * x86_64_init.c: Likewise.
@ -12,7 +12,7 @@
2005-11-19 Roland McGrath <roland@redhat.com> 2005-11-19 Roland McGrath <roland@redhat.com>
* ppc64_reloc.def: REL30 -> ADDR30. * ppc64_reloc.def: REL30 -> ADDR30.
@@ -157,6 +162,9 @@ @@ -179,6 +184,9 @@
* Makefile.am (uninstall): Don't try to remove $(pkgincludedir). * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
(CLEANFILES): Add libebl_$(m).so. (CLEANFILES): Add libebl_$(m).so.
@ -51,7 +51,7 @@
libebl_%.map: Makefile libebl_%.map: Makefile
--- elfutils/backends/Makefile.in --- elfutils/backends/Makefile.in
+++ elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in
@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -59,17 +59,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -199,6 +200,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -176,6 +177,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -231,9 +233,9 @@ target_alias = @target_alias@
@@ -241,9 +243,9 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
@ -79,7 +79,7 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-I$(top_srcdir)/lib -I.. -I$(top_srcdir)/lib -I..
@@ -604,7 +606,7 @@ uninstall-am: uninstall-info-am @@ -605,7 +607,7 @@ uninstall-am:
libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
-Wl,--version-script,$(word 2,$^) \ -Wl,--version-script,$(word 2,$^) \
@ -90,7 +90,7 @@
libebl_%.map: Makefile libebl_%.map: Makefile
--- elfutils/ChangeLog --- elfutils/ChangeLog
+++ elfutils/ChangeLog +++ elfutils/ChangeLog
@@ -15,6 +15,10 @@ @@ -25,6 +25,10 @@
* configure.ac: Add dummy automake conditional to get dependencies * configure.ac: Add dummy automake conditional to get dependencies
for non-generic linker right. See src/Makefile.am. for non-generic linker right. See src/Makefile.am.
@ -101,7 +101,7 @@
2005-11-18 Roland McGrath <roland@redhat.com> 2005-11-18 Roland McGrath <roland@redhat.com>
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
@@ -62,6 +66,17 @@ @@ -72,6 +76,17 @@
* Makefile.am (all_SUBDIRS): Add libdwfl. * Makefile.am (all_SUBDIRS): Add libdwfl.
* configure.ac: Write libdwfl/Makefile. * configure.ac: Write libdwfl/Makefile.
@ -121,7 +121,7 @@
* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
--- elfutils/config/Makefile.in --- elfutils/config/Makefile.in
+++ elfutils/config/Makefile.in +++ elfutils/config/Makefile.in
@@ -83,6 +83,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -129,31 +129,31 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -123,6 +124,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -100,6 +101,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
--- elfutils/configure --- elfutils/configure
+++ elfutils/configure +++ elfutils/configure
@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.127' @@ -674,6 +674,8 @@ YFLAGS
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/' LEX
LEX_OUTPUT_ROOT
ac_unique_file="libelf/libelf.h" LEXLIB
-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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 NEVER_TRUE NEVER_FALSE 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' +WEXTRA
+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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 NEVER_TRUE NEVER_FALSE 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' +LD_AS_NEEDED
ac_subst_files='' LOCALEDIR
DATADIRNAME
# Initialize some variables set by options. NATIVE_LD_TRUE
@@ -3411,6 +3411,92 @@ echo "$as_me: error: gcc with C99 suppor @@ -3874,6 +3876,88 @@ echo "$as_me: error: gcc with C99 suppor
fi fi
+echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5 +{ echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
+echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6 +echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6; }
+if test "${ac_cv_cc_wextra+set}" = set; then +if test "${ac_cv_cc_wextra+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6
+else +else
@ -163,27 +163,22 @@
+void foo (void) { } +void foo (void) { }
+_ACEOF +_ACEOF
+rm -f conftest.$ac_objext +rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (ac_try="$ac_compile"
+ (eval $ac_compile) 2>conftest.er1 +case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$? + ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1 + rm -f conftest.er1
+ cat conftest.err >&5 + cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && + (exit $ac_status); } && {
+ { ac_try='test -z "$ac_c_werror_flag" + test -z "$ac_c_werror_flag" ||
+ || test ! -s conftest.err' + test ! -s conftest.err
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + } && test -s conftest.$ac_objext; then
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_cc_wextra=yes + ac_cv_cc_wextra=yes
+else +else
+ echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5
@ -191,11 +186,12 @@
+ +
+ ac_cv_cc_wextra=no + ac_cv_cc_wextra=no
+fi +fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$old_CFLAGS" +CFLAGS="$old_CFLAGS"
+fi +fi
+echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5 +{ echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
+echo "${ECHO_T}$ac_cv_cc_wextra" >&6 +echo "${ECHO_T}$ac_cv_cc_wextra" >&6; }
+ +
+if test "x$ac_cv_cc_wextra" = xyes; then +if test "x$ac_cv_cc_wextra" = xyes; then
+ WEXTRA=-Wextra + WEXTRA=-Wextra
@ -204,8 +200,8 @@
+fi +fi
+ +
+ +
+echo "$as_me:$LINENO: checking for --as-needed linker option" >&5 +{ echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
+echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6 +echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6; }
+if test "${ac_cv_as_needed+set}" = set; then +if test "${ac_cv_as_needed+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6
+else +else
@ -227,8 +223,8 @@
+fi +fi
+rm -f conftest* +rm -f conftest*
+fi +fi
+echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5 +{ echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
+echo "${ECHO_T}$ac_cv_as_needed" >&6 +echo "${ECHO_T}$ac_cv_as_needed" >&6; }
+if test "x$ac_cv_as_needed" = xyes; then +if test "x$ac_cv_as_needed" = xyes; then
+ LD_AS_NEEDED=-Wl,--as-needed + LD_AS_NEEDED=-Wl,--as-needed
+else +else
@ -241,18 +237,40 @@
LOCALEDIR=$datadir LOCALEDIR=$datadir
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@@ -5040,6 +5126,8 @@ s,@YACC@,$YACC,;t t @@ -5608,10 +5692,10 @@ YFLAGS!$YFLAGS$ac_delim
s,@LEX@,$LEX,;t t LEX!$LEX$ac_delim
s,@LEXLIB@,$LEXLIB,;t t LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t LEXLIB!$LEXLIB$ac_delim
+s,@WEXTRA@,$WEXTRA,;t t +WEXTRA!$WEXTRA$ac_delim
+s,@LD_AS_NEEDED@,$LD_AS_NEEDED,;t t +LD_AS_NEEDED!$LD_AS_NEEDED$ac_delim
s,@LOCALEDIR@,$LOCALEDIR,;t t LOCALEDIR!$LOCALEDIR$ac_delim
s,@DATADIRNAME@,$DATADIRNAME,;t t DATADIRNAME!$DATADIRNAME$ac_delim
s,@NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t -NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
-NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5653,6 +5737,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim
+NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim
base_cpu!$base_cpu$ac_delim
NEVER_TRUE!$NEVER_TRUE$ac_delim
NEVER_FALSE!$NEVER_FALSE$ac_delim
@@ -5683,7 +5769,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- elfutils/configure.ac --- elfutils/configure.ac
+++ elfutils/configure.ac +++ elfutils/configure.ac
@@ -70,6 +70,34 @@ CFLAGS="$old_CFLAGS"]) @@ -71,6 +71,34 @@ CFLAGS="$old_CFLAGS"])
AS_IF([test "x$ac_cv_c99" != xyes], AS_IF([test "x$ac_cv_c99" != xyes],
AC_MSG_ERROR([gcc with C99 support required])) AC_MSG_ERROR([gcc with C99 support required]))
@ -320,7 +338,7 @@
noinst_LIBRARIES = libeu.a noinst_LIBRARIES = libeu.a
--- elfutils/lib/Makefile.in --- elfutils/lib/Makefile.in
+++ elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in
@@ -103,6 +103,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -91,6 +91,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -328,17 +346,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -143,6 +144,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -120,6 +121,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -175,9 +177,9 @@ target_alias = @target_alias@
@@ -185,9 +187,9 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
-@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS) -@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS)
+@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS) +@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS)
@ -381,7 +399,7 @@
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
--- elfutils/libasm/Makefile.in --- elfutils/libasm/Makefile.in
+++ elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in
@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -389,17 +407,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -176,6 +177,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -153,6 +154,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = 1 VERSION = 1
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -208,9 +210,9 @@ target_alias = @target_alias@
@@ -218,9 +220,9 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \ @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -@MUDFLAP_FALSE@ -Wextra -Wformat=2
+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2
@ -434,7 +452,7 @@
noinst_LIBRARIES = libcpu_i386.a noinst_LIBRARIES = libcpu_i386.a
--- elfutils/libcpu/Makefile.in --- elfutils/libcpu/Makefile.in
+++ elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in
@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -87,6 +87,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -442,18 +460,18 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -139,6 +140,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -116,6 +117,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -170,7 +172,7 @@ sysconfdir = @sysconfdir@
@@ -180,7 +182,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused
+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused +AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused
INCLUDES = -I$(srcdir) INCLUDES = -I$(srcdir)
@ -494,7 +512,7 @@
--- elfutils/libdw/Makefile.in --- elfutils/libdw/Makefile.in
+++ elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in
@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -502,17 +520,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -192,6 +193,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = 1 VERSION = 1
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -247,9 +249,10 @@ target_alias = @target_alias@
@@ -258,9 +260,10 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ @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_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 +@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@ -525,7 +543,7 @@
$(COMPILE))) $(COMPILE)))
--- elfutils/libdwfl/ChangeLog --- elfutils/libdwfl/ChangeLog
+++ elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog
@@ -474,6 +474,11 @@ @@ -504,6 +504,11 @@
2005-07-21 Roland McGrath <roland@redhat.com> 2005-07-21 Roland McGrath <roland@redhat.com>
@ -556,7 +574,7 @@
VERSION = 1 VERSION = 1
--- elfutils/libdwfl/Makefile.in --- elfutils/libdwfl/Makefile.in
+++ elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in
@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -564,17 +582,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -176,6 +177,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -153,6 +154,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = 1 VERSION = 1
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -208,9 +210,9 @@ target_alias = @target_alias@
@@ -218,9 +220,9 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
-@MUDFLAP_FALSE@ -Wextra -std=gnu99 -@MUDFLAP_FALSE@ -Wextra -std=gnu99
+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99
@ -586,7 +604,7 @@
--- elfutils/libebl/ChangeLog --- elfutils/libebl/ChangeLog
+++ elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog
@@ -465,6 +465,11 @@ @@ -469,6 +469,11 @@
* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
tracking works right. tracking works right.
@ -617,7 +635,7 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
--- elfutils/libebl/Makefile.in --- elfutils/libebl/Makefile.in
+++ elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in
@@ -132,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -120,6 +120,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -625,17 +643,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -172,6 +173,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -149,6 +150,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = 1 VERSION = 1
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -204,9 +206,9 @@ target_alias = @target_alias@
@@ -214,9 +216,9 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
-@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99
+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 +@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99
@ -647,7 +665,7 @@
--- elfutils/libelf/ChangeLog --- elfutils/libelf/ChangeLog
+++ elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog
@@ -221,6 +221,11 @@ @@ -225,6 +225,11 @@
If section content hasn't been read yet, do it before looking for the If section content hasn't been read yet, do it before looking for the
block size. If no section data present, infer size of section header. block size. If no section data present, infer size of section header.
@ -703,7 +721,7 @@
GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
--- elfutils/libelf/Makefile.in --- elfutils/libelf/Makefile.in
+++ elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in
@@ -38,7 +38,7 @@ PRE_UNINSTALL = : @@ -34,7 +34,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
@ -712,7 +730,7 @@
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
@MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS = @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
subdir = libelf subdir = libelf
@@ -179,6 +179,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -167,6 +167,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -720,17 +738,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -219,6 +220,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -196,6 +197,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = 1 VERSION = 1
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -251,10 +253,10 @@ target_alias = @target_alias@
@@ -261,10 +263,10 @@ sharedstatedir = @sharedstatedir@ top_builddir = @top_builddir@
sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@
target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \ @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@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ +@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
@ -743,7 +761,7 @@
GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
--- elfutils/m4/Makefile.in --- elfutils/m4/Makefile.in
+++ elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in
@@ -82,6 +82,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -70,6 +70,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -751,17 +769,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -122,6 +123,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -99,6 +100,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
--- elfutils/Makefile.in --- elfutils/Makefile.in
+++ elfutils/Makefile.in +++ elfutils/Makefile.in
@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -97,6 +97,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -769,17 +787,17 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -146,6 +147,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -126,6 +127,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
--- elfutils/src/ChangeLog --- elfutils/src/ChangeLog
+++ elfutils/src/ChangeLog +++ elfutils/src/ChangeLog
@@ -87,6 +87,10 @@ @@ -176,6 +176,10 @@
* elflint.c (valid_e_machine): Add EM_ALPHA. * elflint.c (valid_e_machine): Add EM_ALPHA.
Reported by Christian Aichinger <Greek0@gmx.net>. Reported by Christian Aichinger <Greek0@gmx.net>.
@ -790,7 +808,7 @@
2006-08-08 Ulrich Drepper <drepper@redhat.com> 2006-08-08 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
@@ -163,6 +167,10 @@ @@ -252,6 +256,10 @@
* Makefile.am: Add hacks to create dependency files for non-generic * Makefile.am: Add hacks to create dependency files for non-generic
linker. linker.
@ -801,7 +819,7 @@
2006-06-12 Ulrich Drepper <drepper@redhat.com> 2006-06-12 Ulrich Drepper <drepper@redhat.com>
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
@@ -511,6 +519,11 @@ @@ -600,6 +608,11 @@
* readelf.c (print_debug_loc_section): Fix indentation for larger * readelf.c (print_debug_loc_section): Fix indentation for larger
address size. address size.
@ -849,7 +867,7 @@
INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
--- elfutils/src/Makefile.in --- elfutils/src/Makefile.in
+++ elfutils/src/Makefile.in +++ elfutils/src/Makefile.in
@@ -212,6 +212,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -197,6 +197,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -857,15 +875,15 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -252,6 +253,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -226,6 +227,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ -d YACC = @YACC@ -d
ac_ct_CC = @ac_ct_CC@ @@ -283,13 +285,13 @@ top_srcdir = @top_srcdir@
@@ -296,13 +298,13 @@ target_alias = @target_alias@
@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
@MUDFLAP_FALSE@ $(native_ld_cflags) $(if \ @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \
@MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \ @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \
@ -942,7 +960,7 @@
} }
/* Open the file. */ /* Open the file. */
@@ -1691,7 +1707,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1702,7 +1718,7 @@ handle_elf (int fd, Elf *elf, const char
/* If requested, preserve the timestamp. */ /* If requested, preserve the timestamp. */
if (tvp != NULL) if (tvp != NULL)
{ {
@ -951,7 +969,7 @@
{ {
error (0, errno, gettext ("\ error (0, errno, gettext ("\
cannot set access and modification date of '%s'"), cannot set access and modification date of '%s'"),
@@ -1748,7 +1764,7 @@ handle_ar (int fd, Elf *elf, const char @@ -1759,7 +1775,7 @@ handle_ar (int fd, Elf *elf, const char
if (tvp != NULL) if (tvp != NULL)
{ {
@ -962,7 +980,7 @@
cannot set access and modification date of '%s'"), fname); cannot set access and modification date of '%s'"), fname);
--- elfutils/tests/ChangeLog --- elfutils/tests/ChangeLog
+++ elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog
@@ -473,6 +473,11 @@ @@ -525,6 +525,11 @@
* Makefile.am (TESTS): Add run-elflint-test.sh. * Makefile.am (TESTS): Add run-elflint-test.sh.
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
@ -994,7 +1012,7 @@
endif endif
--- elfutils/tests/Makefile.in --- elfutils/tests/Makefile.in
+++ elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in
@@ -310,6 +310,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -315,6 +315,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@ -1002,18 +1020,18 @@
LEX = @LEX@ LEX = @LEX@
LEXLIB = @LEXLIB@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -350,6 +351,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ @@ -344,6 +345,7 @@ SHELL = @SHELL@
TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ STRIP = @STRIP@
USE_NLS = @USE_NLS@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
+WEXTRA = @WEXTRA@ +WEXTRA = @WEXTRA@
XGETTEXT = @XGETTEXT@ XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
YACC = @YACC@ YACC = @YACC@
ac_ct_CC = @ac_ct_CC@ @@ -398,10 +400,10 @@ sysconfdir = @sysconfdir@
@@ -391,10 +393,10 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
+@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_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

52
elfutils-robustify.patch
View File

@ -278,9 +278,9 @@ src/
printf (ngettext ("\ printf (ngettext ("\
\nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n", \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
"\ "\
--- elfutils-0.127/src/strip.c.robustify --- elfutils-0.128/src/strip.c.orig
+++ elfutils-0.127/src/strip.c +++ elfutils-0.128/src/strip.c
@@ -412,6 +412,7 @@ handle_elf (int fd, Elf *elf, const char @@ -413,6 +413,7 @@ handle_elf (int fd, Elf *elf, const char
Elf_Data debuglink_crc_data; Elf_Data debuglink_crc_data;
bool any_symtab_changes = false; bool any_symtab_changes = false;
Elf_Data *shstrtab_data = NULL; Elf_Data *shstrtab_data = NULL;
@ -288,7 +288,7 @@ src/
/* Create the full name of the file. */ /* Create the full name of the file. */
if (prefix != NULL) if (prefix != NULL)
@@ -542,6 +543,11 @@ handle_elf (int fd, Elf *elf, const char @@ -543,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char
goto fail_close; goto fail_close;
} }
@ -300,7 +300,7 @@ src/
/* Storage for section information. We leave room for two more /* Storage for section information. We leave room for two more
entries since we unconditionally create a section header string entries since we unconditionally create a section header string
table. Maybe some weird tool created an ELF file without one. table. Maybe some weird tool created an ELF file without one.
@@ -563,7 +569,7 @@ handle_elf (int fd, Elf *elf, const char @@ -564,7 +570,7 @@ handle_elf (int fd, Elf *elf, const char
{ {
/* This should always be true (i.e., there should not be any /* This should always be true (i.e., there should not be any
holes in the numbering). */ holes in the numbering). */
@ -309,7 +309,7 @@ src/
shdr_info[cnt].scn = scn; shdr_info[cnt].scn = scn;
@@ -576,6 +582,7 @@ handle_elf (int fd, Elf *elf, const char @@ -577,6 +583,7 @@ handle_elf (int fd, Elf *elf, const char
shdr_info[cnt].shdr.sh_name); shdr_info[cnt].shdr.sh_name);
if (shdr_info[cnt].name == NULL) if (shdr_info[cnt].name == NULL)
{ {
@ -317,7 +317,7 @@ src/
error (0, 0, gettext ("illformed file '%s'"), fname); error (0, 0, gettext ("illformed file '%s'"), fname);
goto fail_close; goto fail_close;
} }
@@ -585,6 +592,8 @@ handle_elf (int fd, Elf *elf, const char @@ -586,6 +593,8 @@ handle_elf (int fd, Elf *elf, const char
/* Remember the shdr.sh_link value. */ /* Remember the shdr.sh_link value. */
shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link; shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;
@ -326,7 +326,7 @@ src/
/* Sections in files other than relocatable object files which /* Sections in files other than relocatable object files which
are not loaded can be freely moved by us. In relocatable are not loaded can be freely moved by us. In relocatable
@@ -597,7 +606,7 @@ handle_elf (int fd, Elf *elf, const char @@ -598,7 +607,7 @@ handle_elf (int fd, Elf *elf, const char
appropriate reference. */ appropriate reference. */
if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX)) if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
{ {
@ -335,7 +335,7 @@ src/
shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt; shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
} }
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP)) else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
@@ -614,7 +623,12 @@ handle_elf (int fd, Elf *elf, const char @@ -615,7 +624,12 @@ handle_elf (int fd, Elf *elf, const char
for (inner = 1; for (inner = 1;
inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word); inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
++inner) ++inner)
@ -348,7 +348,7 @@ src/
if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0)) if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
/* If the section group contains only one element and this /* If the section group contains only one element and this
@@ -625,7 +639,7 @@ handle_elf (int fd, Elf *elf, const char @@ -626,7 +640,7 @@ handle_elf (int fd, Elf *elf, const char
} }
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)) else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
{ {
@ -357,7 +357,7 @@ src/
shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt; shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
} }
@@ -633,7 +647,7 @@ handle_elf (int fd, Elf *elf, const char @@ -634,7 +648,7 @@ handle_elf (int fd, Elf *elf, const char
discarded right away. */ discarded right away. */
if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0) if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
{ {
@ -366,7 +366,7 @@ src/
if (shdr_info[shdr_info[cnt].group_idx].idx == 0) if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
{ {
@@ -708,11 +722,15 @@ handle_elf (int fd, Elf *elf, const char @@ -709,11 +723,15 @@ handle_elf (int fd, Elf *elf, const char
{ {
/* If a relocation section is marked as being removed make /* If a relocation section is marked as being removed make
sure the section it is relocating is removed, too. */ sure the section it is relocating is removed, too. */
@ -384,7 +384,7 @@ src/
if (shdr_info[cnt].idx == 1) if (shdr_info[cnt].idx == 1)
{ {
@@ -737,7 +755,7 @@ handle_elf (int fd, Elf *elf, const char @@ -738,7 +756,7 @@ handle_elf (int fd, Elf *elf, const char
if (shdr_info[cnt].symtab_idx != 0 if (shdr_info[cnt].symtab_idx != 0
&& shdr_info[shdr_info[cnt].symtab_idx].data == NULL) && shdr_info[shdr_info[cnt].symtab_idx].data == NULL)
{ {
@ -393,7 +393,7 @@ src/
shdr_info[shdr_info[cnt].symtab_idx].data shdr_info[shdr_info[cnt].symtab_idx].data
= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
@@ -777,6 +795,9 @@ handle_elf (int fd, Elf *elf, const char @@ -778,6 +796,9 @@ handle_elf (int fd, Elf *elf, const char
else if (scnidx == SHN_XINDEX) else if (scnidx == SHN_XINDEX)
scnidx = xndx; scnidx = xndx;
@ -403,7 +403,7 @@ src/
if (shdr_info[scnidx].idx == 0) if (shdr_info[scnidx].idx == 0)
{ {
/* Mark this section as used. */ /* Mark this section as used. */
@@ -808,12 +829,16 @@ handle_elf (int fd, Elf *elf, const char @@ -809,12 +830,16 @@ handle_elf (int fd, Elf *elf, const char
} }
/* Handle references through sh_info. */ /* Handle references through sh_info. */
@ -422,7 +422,7 @@ src/
/* Mark the section as investigated. */ /* Mark the section as investigated. */
shdr_info[cnt].idx = 2; shdr_info[cnt].idx = 2;
@@ -912,7 +937,7 @@ handle_elf (int fd, Elf *elf, const char @@ -953,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char
error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"), error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
elf_errmsg (-1)); elf_errmsg (-1));
@ -431,7 +431,7 @@ src/
/* Add this name to the section header string table. */ /* Add this name to the section header string table. */
shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0); shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
@@ -949,7 +974,7 @@ handle_elf (int fd, Elf *elf, const char @@ -990,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char
error (EXIT_FAILURE, 0, error (EXIT_FAILURE, 0,
gettext ("while create section header section: %s"), gettext ("while create section header section: %s"),
elf_errmsg (-1)); elf_errmsg (-1));
@ -440,7 +440,7 @@ src/
shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn); shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
if (shdr_info[cnt].data == NULL) if (shdr_info[cnt].data == NULL)
@@ -980,7 +1005,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1021,7 +1046,7 @@ handle_elf (int fd, Elf *elf, const char
} }
/* Index of the section header table in the shdr_info array. */ /* Index of the section header table in the shdr_info array. */
@ -449,7 +449,7 @@ src/
/* Add the section header string table section name. */ /* Add the section header string table section name. */
shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10); shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10);
@@ -1005,7 +1030,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1046,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
error (EXIT_FAILURE, 0, error (EXIT_FAILURE, 0,
gettext ("while create section header section: %s"), gettext ("while create section header section: %s"),
elf_errmsg (-1)); elf_errmsg (-1));
@ -458,7 +458,7 @@ src/
/* Finalize the string table and fill in the correct indices in the /* Finalize the string table and fill in the correct indices in the
section headers. */ section headers. */
@@ -1095,20 +1120,20 @@ handle_elf (int fd, Elf *elf, const char @@ -1136,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char
shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
NULL); NULL);
@ -482,7 +482,7 @@ src/
>= shdr_info[cnt].data->d_size / elsize); >= shdr_info[cnt].data->d_size / elsize);
} }
@@ -1163,7 +1188,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1204,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char
sec = shdr_info[sym->st_shndx].idx; sec = shdr_info[sym->st_shndx].idx;
else else
{ {
@ -491,7 +491,7 @@ src/
sec = shdr_info[xshndx].idx; sec = shdr_info[xshndx].idx;
} }
@@ -1184,7 +1209,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1225,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char
nxshndx = sec; nxshndx = sec;
} }
@ -500,7 +500,7 @@ src/
if ((inner != destidx || nshndx != sym->st_shndx if ((inner != destidx || nshndx != sym->st_shndx
|| (shndxdata != NULL && nxshndx != xshndx)) || (shndxdata != NULL && nxshndx != xshndx))
@@ -1207,7 +1232,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1248,7 +1273,7 @@ handle_elf (int fd, Elf *elf, const char
else else
/* This is a section symbol for a section which has /* This is a section symbol for a section which has
been removed. */ been removed. */
@ -509,7 +509,7 @@ src/
} }
if (destidx != inner) if (destidx != inner)
@@ -1371,11 +1396,11 @@ handle_elf (int fd, Elf *elf, const char @@ -1441,11 +1466,11 @@ handle_elf (int fd, Elf *elf, const char
{ {
GElf_Sym sym_mem; GElf_Sym sym_mem;
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@ -523,7 +523,7 @@ src/
size_t hidx = elf_hash (name) % nbucket; size_t hidx = elf_hash (name) % nbucket;
if (bucket[hidx] == 0) if (bucket[hidx] == 0)
@@ -1394,7 +1419,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1464,7 +1489,7 @@ handle_elf (int fd, Elf *elf, const char
else else
{ {
/* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */ /* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */
@ -532,7 +532,7 @@ src/
== sizeof (Elf64_Xword)); == sizeof (Elf64_Xword));
Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf; Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
@@ -1428,11 +1453,11 @@ handle_elf (int fd, Elf *elf, const char @@ -1495,11 +1520,11 @@ handle_elf (int fd, Elf *elf, const char
{ {
GElf_Sym sym_mem; GElf_Sym sym_mem;
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);

43
elfutils-strip-copy-symtab.patch
View File

@ -14,7 +14,7 @@
} *shdr_info = NULL; } *shdr_info = NULL;
Elf_Scn *scn; Elf_Scn *scn;
size_t cnt; size_t cnt;
@@ -826,8 +827,39 @@ handle_elf (int fd, Elf *elf, const char @@ -826,6 +827,37 @@ handle_elf (int fd, Elf *elf, const char
The ones that are not removed in the stripped file are SHT_NOBITS. */ The ones that are not removed in the stripped file are SHT_NOBITS. */
if (debug_fname != NULL) if (debug_fname != NULL)
{ {
@ -23,8 +23,8 @@
+ - libbfd isn't able to look up the .symtab/.strtab in the stripped + - libbfd isn't able to look up the .symtab/.strtab in the stripped
+ object instead. As a workaround, emit .symtab/.strtab in both + object instead. As a workaround, emit .symtab/.strtab in both
+ places. */ + places. */
for (cnt = 1; cnt < shnum; ++cnt) + for (cnt = 1; cnt < shnum; ++cnt)
{ + {
+ if (shdr_info[cnt].idx == 0 + if (shdr_info[cnt].idx == 0
+ && (shdr_info[cnt].shdr.sh_type == SHT_REL + && (shdr_info[cnt].shdr.sh_type == SHT_REL
+ || shdr_info[cnt].shdr.sh_type == SHT_RELA) + || shdr_info[cnt].shdr.sh_type == SHT_RELA)
@ -49,22 +49,18 @@
+ } + }
+ } + }
+ +
+ for (cnt = 1; cnt < shnum; ++cnt) for (cnt = 1; cnt < shnum; ++cnt)
+ { {
scn = elf_newscn (debugelf); scn = elf_newscn (debugelf);
if (scn == NULL) @@ -835,6 +867,7 @@ handle_elf (int fd, Elf *elf, const char
error (EXIT_FAILURE, 0,
@@ -835,7 +867,8 @@ handle_elf (int fd, Elf *elf, const char
elf_errmsg (-1)); elf_errmsg (-1));
bool discard_section = (shdr_info[cnt].idx > 0 bool discard_section = (shdr_info[cnt].idx > 0
- && cnt != ehdr->e_shstrndx); + && shdr_info[cnt].debug_data == NULL
+ && cnt != ehdr->e_shstrndx && shdr_info[cnt].shdr.sh_type != SHT_NOTE
+ && shdr_info[cnt].debug_data == NULL); && cnt != ehdr->e_shstrndx);
/* Set the section header in the new file. */ @@ -865,6 +898,13 @@ handle_elf (int fd, Elf *elf, const char
GElf_Shdr debugshdr = shdr_info[cnt].shdr;
@@ -864,6 +897,13 @@ handle_elf (int fd, Elf *elf, const char
*debugdata = *shdr_info[cnt].data; *debugdata = *shdr_info[cnt].data;
if (discard_section) if (discard_section)
debugdata->d_buf = NULL; debugdata->d_buf = NULL;
@ -78,7 +74,7 @@
} }
/* Finish the ELF header. Fill in the fields not handled by /* Finish the ELF header. Fill in the fields not handled by
@@ -1055,7 +1095,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1056,7 +1096,7 @@ handle_elf (int fd, Elf *elf, const char
shdr_info[shdr_info[cnt].shdr.sh_info].idx; shdr_info[shdr_info[cnt].shdr.sh_info].idx;
/* Get the data from the old file if necessary. We already /* Get the data from the old file if necessary. We already
@ -87,7 +83,7 @@
if (cnt < shnum) if (cnt < shnum)
{ {
if (shdr_info[cnt].data == NULL) if (shdr_info[cnt].data == NULL)
@@ -1264,6 +1304,13 @@ handle_elf (int fd, Elf *elf, const char @@ -1283,6 +1323,13 @@ handle_elf (int fd, Elf *elf, const char
if (shdr_info[shdr_info[cnt].old_sh_link].newsymidx == NULL) if (shdr_info[shdr_info[cnt].old_sh_link].newsymidx == NULL)
continue; continue;
@ -101,7 +97,7 @@
Elf32_Word *newsymidx Elf32_Word *newsymidx
= shdr_info[shdr_info[cnt].old_sh_link].newsymidx; = shdr_info[shdr_info[cnt].old_sh_link].newsymidx;
Elf_Data *d = elf_getdata (shdr_info[cnt].idx == 0 Elf_Data *d = elf_getdata (shdr_info[cnt].idx == 0
@@ -1322,6 +1369,13 @@ handle_elf (int fd, Elf *elf, const char @@ -1341,6 +1388,13 @@ handle_elf (int fd, Elf *elf, const char
if (shdr_info[symtabidx].newsymidx == NULL) if (shdr_info[symtabidx].newsymidx == NULL)
continue; continue;
@ -115,7 +111,7 @@
assert (shdr_info[cnt].idx > 0); assert (shdr_info[cnt].idx > 0);
/* The hash section in the new file. */ /* The hash section in the new file. */
@@ -1447,7 +1501,7 @@ handle_elf (int fd, Elf *elf, const char @@ -1460,7 +1514,7 @@ handle_elf (int fd, Elf *elf, const char
chain[hidx] = inner; chain[hidx] = inner;
} }
} }
@ -124,7 +120,7 @@
} }
else if (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym) else if (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)
{ {
@@ -1460,6 +1514,13 @@ handle_elf (int fd, Elf *elf, const char @@ -1473,6 +1527,13 @@ handle_elf (int fd, Elf *elf, const char
if (shdr_info[symtabidx].newsymidx == NULL) if (shdr_info[symtabidx].newsymidx == NULL)
continue; continue;
@ -138,7 +134,7 @@
assert (shdr_info[cnt].idx > 0); assert (shdr_info[cnt].idx > 0);
/* The symbol version section in the new file. */ /* The symbol version section in the new file. */
@@ -1504,20 +1565,27 @@ handle_elf (int fd, Elf *elf, const char @@ -1515,20 +1576,27 @@ handle_elf (int fd, Elf *elf, const char
else if (shdr_info[cnt].shdr.sh_type == SHT_GROUP) else if (shdr_info[cnt].shdr.sh_type == SHT_GROUP)
{ {
/* Check whether the associated symbol table changed. */ /* Check whether the associated symbol table changed. */
@ -178,7 +174,7 @@
} }
} }
} }
@@ -1647,7 +1715,10 @@ handle_elf (int fd, Elf *elf, const char @@ -1658,7 +1726,10 @@ handle_elf (int fd, Elf *elf, const char
table indices. */ table indices. */
if (any_symtab_changes) if (any_symtab_changes)
for (cnt = 1; cnt <= shdridx; ++cnt) for (cnt = 1; cnt <= shdridx; ++cnt)
@ -190,9 +186,8 @@
/* Free the memory. */ /* Free the memory. */
if ((shnum + 2) * sizeof (struct shdr_info) > MAX_STACK_ALLOC) if ((shnum + 2) * sizeof (struct shdr_info) > MAX_STACK_ALLOC)
--- elfutils/tests/run-strip-test5.sh.~1~
--- elfutils-0.124/tests/run-strip-test5.sh.~1~ +++ elfutils/tests/run-strip-test5.sh
+++ elfutils-0.124/tests/run-strip-test5.sh
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
original=testfile8 original=testfile8
-stripped=testfile16 -stripped=testfile16

54
elfutils.spec
View File

@ -1,4 +1,4 @@
%define eu_version 0.127 %define eu_version 0.128
%define eu_release 1 %define eu_release 1
%if %{?_with_compat:1}%{!?_with_compat:0} %if %{?_with_compat:1}%{!?_with_compat:0}
@ -28,8 +28,8 @@ Source: elfutils-%{version}.tar.gz
Patch1: elfutils-portability.patch Patch1: elfutils-portability.patch
Patch2: elfutils-robustify.patch Patch2: elfutils-robustify.patch
Obsoletes: libelf libelf-devel Obsoletes: libelf libelf-devel
Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
Requires: elfutils-libs = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release}
Patch0: elfutils-strip-copy-symtab.patch Patch0: elfutils-strip-copy-symtab.patch
Source2: testfile16.symtab.bz2 Source2: testfile16.symtab.bz2
@ -62,11 +62,8 @@ symbols), readelf (to see the raw ELF file structures), and elflint
Summary: Libraries to handle compiled objects. Summary: Libraries to handle compiled objects.
Group: Development/Tools Group: Development/Tools
License: GPL License: GPL
Requires: elfutils-libelf = %{version}-%{release} Provides: elfutils-libs-%{_arch} = %{version}-%{release}
Conflicts: elfutils < %{version}-%{release} Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
Conflicts: elfutils > %{version}-%{release}
Conflicts: elfutils-devel < %{version}-%{release}
Conflicts: elfutils-devel > %{version}-%{release}
%description libs %description libs
The elfutils-libs package contains libraries which implement DWARF, ELF, The elfutils-libs package contains libraries which implement DWARF, ELF,
@ -78,12 +75,11 @@ other programs using these libraries.
Summary: Development libraries to handle compiled objects. Summary: Development libraries to handle compiled objects.
Group: Development/Tools Group: Development/Tools
License: GPL License: GPL
Requires: elfutils-libs = %{version}-%{release} Provides: elfutils-devel-%{_arch} = %{version}-%{release}
Requires: elfutils-libelf-devel = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release}
Conflicts: elfutils-libelf-devel < %{version}-%{release} Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release}
Conflicts: elfutils-libelf-devel > %{version}-%{release}
%if !0%{?separate_devel_static} %if !0%{?separate_devel_static}
Requires: elfutils-devel-static = %{version}-%{release} Requires: elfutils-devel-static-%{_arch} = %{version}-%{release}
%endif %endif
%description devel %description devel
@ -96,10 +92,9 @@ assembler interface.
%package devel-static %package devel-static
Summary: Static archives to handle compiled objects. Summary: Static archives to handle compiled objects.
Group: Development/Tools Group: Development/Tools
Requires: elfutils-devel = %{version}-%{release} Provides: elfutils-devel-static-%{_arch} = %{version}-%{release}
Conflicts: elfutils-devel < %{version}-%{release} Requires: elfutils-devel-%{_arch} = %{version}-%{release}
Conflicts: elfutils-devel > %{version}-%{release} Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release}
Requires: elfutils-libelf-devel-static = %{version}-%{release}
%description devel-static %description devel-static
The elfutils-devel-static package contains the static archives The elfutils-devel-static package contains the static archives
@ -108,12 +103,7 @@ with the code to handle compiled objects.
%package libelf %package libelf
Summary: Library to read and write ELF files. Summary: Library to read and write ELF files.
Group: Development/Tools Group: Development/Tools
Conflicts: elfutils < %{version}-%{release} Provides: elfutils-libelf-%{_arch} = %{version}-%{release}
Conflicts: elfutils > %{version}-%{release}
Conflicts: elfutils-libs < %{version}-%{release}
Conflicts: elfutils-libs > %{version}-%{release}
Conflicts: elfutils-libelf-devel < %{version}-%{release}
Conflicts: elfutils-libelf-devel > %{version}-%{release}
%description libelf %description libelf
The elfutils-libelf package provides a DSO which allows reading and The elfutils-libelf package provides a DSO which allows reading and
@ -124,10 +114,11 @@ elfutils package use it also to generate new ELF files.
%package libelf-devel %package libelf-devel
Summary: Development support for libelf Summary: Development support for libelf
Group: Development/Tools Group: Development/Tools
Requires: elfutils-libelf = %{version}-%{release} Provides: elfutils-libelf-devel-%{_arch} = %{version}-%{release}
Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
Conflicts: libelf-devel Conflicts: libelf-devel
%if !0%{?separate_devel_static} %if !0%{?separate_devel_static}
Requires: elfutils-libelf-devel-static = %{version}-%{release} Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release}
%endif %endif
%description libelf-devel %description libelf-devel
@ -139,9 +130,8 @@ different sections of an ELF file.
%package libelf-devel-static %package libelf-devel-static
Summary: Static archive of libelf Summary: Static archive of libelf
Group: Development/Tools Group: Development/Tools
Requires: elfutils-libelf-devel = %{version}-%{release} Provides: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release}
Conflicts: elfutils-libelf-devel < %{version}-%{release} Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release}
Conflicts: elfutils-libelf-devel > %{version}-%{release}
%description libelf-devel-static %description libelf-devel-static
The elfutils-libelf-static package contains the static archive The elfutils-libelf-static package contains the static archive
@ -218,12 +208,14 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/eu-elflint %{_bindir}/eu-elflint
%{_bindir}/eu-findtextrel %{_bindir}/eu-findtextrel
%{_bindir}/eu-nm %{_bindir}/eu-nm
#%{_bindir}/eu-objdump
%{_bindir}/eu-ranlib %{_bindir}/eu-ranlib
%{_bindir}/eu-readelf %{_bindir}/eu-readelf
%{_bindir}/eu-size %{_bindir}/eu-size
%{_bindir}/eu-strings %{_bindir}/eu-strings
%{_bindir}/eu-strip %{_bindir}/eu-strip
#%{_bindir}/eu-ld #%{_bindir}/eu-ld
%{_bindir}/eu-unstrip
%files libs %files libs
%defattr(-,root,root) %defattr(-,root,root)
@ -267,6 +259,12 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libelf.a %{_libdir}/libelf.a
%changelog %changelog
* Fri Jun 8 2007 Roland McGrath <roland@redhat.com> - 0.128-1
- Update to 0.128
- new program: unstrip
- elfcmp: new option --hash-inexact
- Replace Conflicts: with Provides/Requires using -arch
* Wed Apr 18 2007 Roland McGrath <roland@redhat.com> - 0.127-1 * Wed Apr 18 2007 Roland McGrath <roland@redhat.com> - 0.127-1
- Update to 0.127 - Update to 0.127
- libdw: new function dwarf_getsrcdirs - libdw: new function dwarf_getsrcdirs