diff --git a/.cvsignore b/.cvsignore index 264d3c0..26cb75f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.141.tar.bz2 +elfutils-0.142.tar.bz2 diff --git a/elfutils-0.142.tar.bz2.sig b/elfutils-0.142.tar.bz2.sig new file mode 100644 index 0000000..c9d75d1 Binary files /dev/null and b/elfutils-0.142.tar.bz2.sig differ diff --git a/elfutils-portability.patch b/elfutils-portability.patch index 79dc4fa..9711b89 100644 --- a/elfutils-portability.patch +++ b/elfutils-portability.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -33,6 +33,10 @@ +@@ -48,6 +48,10 @@ * ppc_attrs.c (ppc_check_object_attribute): Handle tag GNU_Power_ABI_Struct_Return. @@ -11,7 +11,7 @@ 2008-10-04 Ulrich Drepper * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and -@@ -360,6 +364,11 @@ +@@ -375,6 +379,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -382,6 +391,9 @@ +@@ -397,6 +406,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -51,15 +51,7 @@ -std=gnu99 INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -@@ -59,7 +61,6 @@ endif - - textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi - -- - i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \ - i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c - cpu_i386 = ../libcpu/libcpu_i386.a -@@ -115,7 +116,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map +@@ -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,$^) \ @@ -70,7 +62,7 @@ # XXX Should not be needed... --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -158,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -78,7 +70,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -187,6 +188,7 @@ SHELL = @SHELL@ +@@ -192,6 +193,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -86,7 +78,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -245,9 +247,9 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -98,7 +90,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. -@@ -650,7 +652,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map +@@ -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,$^) \ @@ -149,7 +141,7 @@ * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in -@@ -73,6 +73,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -157,7 +149,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -102,6 +103,7 @@ SHELL = @SHELL@ +@@ -105,6 +106,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -186,7 +178,7 @@ #include --- elfutils/configure +++ elfutils/configure -@@ -642,6 +642,8 @@ NATIVE_LD_FALSE +@@ -644,6 +644,8 @@ NATIVE_LD_FALSE NATIVE_LD_TRUE DATADIRNAME LOCALEDIR @@ -195,7 +187,7 @@ LEXLIB LEX_OUTPUT_ROOT LEX -@@ -4041,6 +4043,152 @@ $as_echo "$as_me: error: gcc with C99 su +@@ -4094,6 +4096,152 @@ $as_echo "$as_me: error: gcc with C99 su fi @@ -348,7 +340,7 @@ { $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 -@@ -4106,9 +4254,18 @@ fi +@@ -4159,9 +4307,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 @@ -484,7 +476,7 @@ noinst_LIBRARIES = libeu.a --- elfutils/lib/Makefile.in +++ elfutils/lib/Makefile.in -@@ -94,6 +94,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -98,6 +98,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -492,7 +484,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -123,6 +124,7 @@ SHELL = @SHELL@ +@@ -127,6 +128,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -500,7 +492,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -181,9 +183,9 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -545,7 +537,7 @@ -I$(top_srcdir)/lib --- elfutils/libasm/Makefile.in +++ elfutils/libasm/Makefile.in -@@ -128,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -553,7 +545,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -157,6 +158,7 @@ SHELL = @SHELL@ +@@ -174,6 +175,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -561,7 +553,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -215,9 +217,9 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -621,7 +613,7 @@ $(if $($(*F)_no_Werror),,-Werror) --- elfutils/libcpu/Makefile.in +++ elfutils/libcpu/Makefile.in -@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -114,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -629,7 +621,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( @@ -688,7 +680,7 @@ --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -186,6 +186,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -696,7 +688,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -194,6 +195,7 @@ SHELL = @SHELL@ +@@ -215,6 +216,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -704,7 +696,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -252,9 +254,10 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -719,7 +711,7 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1076,6 +1076,11 @@ +@@ -1098,6 +1098,11 @@ 2005-07-21 Roland McGrath @@ -750,7 +742,7 @@ VERSION = 1 --- elfutils/libdwfl/Makefile.in +++ elfutils/libdwfl/Makefile.in -@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -176,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -758,7 +750,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -185,6 +186,7 @@ SHELL = @SHELL@ +@@ -205,6 +206,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -766,7 +758,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -243,9 +245,9 @@ top_builddir = @top_builddir@ +@@ -263,9 +265,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ @@ -780,7 +772,7 @@ --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -569,6 +569,11 @@ +@@ -593,6 +593,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -811,7 +803,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ --- elfutils/libebl/Makefile.in +++ elfutils/libebl/Makefile.in -@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -141,6 +141,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -819,7 +811,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -153,6 +154,7 @@ SHELL = @SHELL@ +@@ -170,6 +171,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -827,7 +819,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -211,9 +213,9 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -841,7 +833,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -537,6 +537,11 @@ +@@ -576,6 +576,11 @@ * elf.h: Update from glibc. @@ -894,7 +886,7 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) --- elfutils/libelf/Makefile.in +++ elfutils/libelf/Makefile.in -@@ -172,6 +172,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -188,6 +188,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -902,7 +894,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -201,6 +202,7 @@ SHELL = @SHELL@ +@@ -217,6 +218,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -910,7 +902,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -259,10 +261,10 @@ top_builddir = @top_builddir@ +@@ -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 \ @@ -925,7 +917,7 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in -@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -933,7 +925,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -101,6 +102,7 @@ SHELL = @SHELL@ +@@ -104,6 +105,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -943,7 +935,7 @@ YACC = @YACC@ --- elfutils/Makefile.in +++ elfutils/Makefile.in -@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -951,7 +943,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -139,6 +140,7 @@ SHELL = @SHELL@ +@@ -184,6 +185,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -976,7 +968,7 @@ /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -91,6 +91,8 @@ +@@ -155,6 +155,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -985,7 +977,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -274,6 +276,11 @@ +@@ -338,6 +340,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -997,7 +989,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -525,6 +532,8 @@ +@@ -589,6 +596,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1006,7 +998,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -964,6 +973,10 @@ +@@ -1028,6 +1037,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1017,7 +1009,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1040,6 +1053,10 @@ +@@ -1104,6 +1117,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1028,7 +1020,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1388,6 +1405,11 @@ +@@ -1452,6 +1469,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1086,7 +1078,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in -@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -226,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1094,7 +1086,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -231,6 +232,7 @@ SHELL = @SHELL@ +@@ -255,6 +256,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1102,7 +1094,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -d -@@ -291,13 +293,13 @@ zip_LIBS = @zip_LIBS@ +@@ -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 \ @@ -1118,7 +1110,7 @@ @MUDFLAP_TRUE@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ @MUDFLAP_TRUE@ $(CFLAGS_$(*F)) INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -@@ -343,6 +345,9 @@ strings_no_Wformat = yes +@@ -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 @@ -1130,7 +1122,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7443,7 +7443,7 @@ dump_archive_index (Elf *elf, const char +@@ -7591,7 +7591,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)) @@ -1220,7 +1212,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -106,6 +106,8 @@ +@@ -124,6 +124,8 @@ 2008-01-21 Roland McGrath @@ -1229,7 +1221,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -814,6 +816,11 @@ +@@ -832,6 +834,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1272,7 +1264,7 @@ endif --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -343,6 +343,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -359,6 +359,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1280,7 +1272,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -372,6 +373,7 @@ SHELL = @SHELL@ +@@ -388,6 +389,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1288,7 +1280,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -429,10 +431,10 @@ top_build_prefix = @top_build_prefix@ +@@ -445,10 +447,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index c238f52..9a61aa6 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,6 +1,6 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -529,6 +529,49 @@ +@@ -568,6 +568,49 @@ 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. @@ -73,8 +73,8 @@ +++ elfutils/libelf/elf32_getshdr.c @@ -1,5 +1,5 @@ /* Return section header. -- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007 Red Hat, Inc. -+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008 Red Hat, Inc. +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2009 Red Hat, Inc. ++ Copyright (C) 1998-2009 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper , 1998. @@ -82,8 +82,8 @@ goto out; size_t shnum; -- if (__elf_getshnum_rdlock (elf, &shnum) != 0) -+ if (__elf_getshnum_rdlock (elf, &shnum) != 0 +- if (__elf_getshdrnum_rdlock (elf, &shnum) != 0) ++ if (__elf_getshdrnum_rdlock (elf, &shnum) != 0 + || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr))) goto out; size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr)); @@ -132,7 +132,7 @@ Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns; Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *)); char *const shdr_start = ((char *) elf->map_address + elf->start_offset -@@ -633,6 +636,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf +@@ -636,6 +639,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf /* Write all the sections. Well, only those which are modified. */ if (shnum > 0) { @@ -252,9 +252,9 @@ || n * sizeof (uint32_t) > index_size) { /* This index table cannot be right since it does not fit into ---- elfutils/libelf/elf_getshstrndx.c -+++ elfutils/libelf/elf_getshstrndx.c -@@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst) +--- elfutils/libelf/elf_getshdrstrndx.c ++++ elfutils/libelf/elf_getshdrstrndx.c +@@ -125,10 +125,25 @@ elf_getshdrstrndx (elf, dst) if (elf->map_address != NULL && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA && (ALLOW_UNALIGNED @@ -282,7 +282,7 @@ else { /* We avoid reading in all the section headers. Just read -@@ -163,10 +178,25 @@ elf_getshstrndx (elf, dst) +@@ -163,10 +178,25 @@ elf_getshdrstrndx (elf, dst) if (elf->map_address != NULL && elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA && (ALLOW_UNALIGNED @@ -776,7 +776,7 @@ __libelf_seterrno (ELF_E_INVALID_INDEX); --- elfutils/libelf/libelfP.h +++ elfutils/libelf/libelfP.h -@@ -611,4 +611,13 @@ extern uint32_t __libelf_crc32 (uint32_t +@@ -606,4 +606,13 @@ extern uint32_t __libelf_crc32 (uint32_t /* Align offset to 4 bytes as needed for note name and descriptor data. */ #define NOTE_ALIGN(n) (((n) + 3) & -4U) @@ -792,7 +792,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1376,6 +1376,16 @@ +@@ -1440,6 +1440,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -809,7 +809,7 @@ 2005-06-08 Roland McGrath * readelf.c (print_ops): Add consts. -@@ -1421,6 +1431,19 @@ +@@ -1485,6 +1495,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -873,7 +873,7 @@ static void check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size) { -@@ -611,7 +619,8 @@ section [%2d] '%s': symbol table cannot +@@ -612,7 +620,8 @@ section [%2d] '%s': symbol table cannot } } @@ -883,7 +883,7 @@ ERROR (gettext ("\ section [%2u] '%s': entry size is does not match ElfXX_Sym\n"), idx, section_name (ebl, idx)); -@@ -649,7 +658,7 @@ section [%2d] '%s': XINDEX for zeroth en +@@ -650,7 +659,7 @@ section [%2d] '%s': XINDEX for zeroth en xndxscnidx, section_name (ebl, xndxscnidx)); } @@ -892,7 +892,7 @@ { sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx); if (sym == NULL) -@@ -669,7 +678,8 @@ section [%2d] '%s': symbol %zu: invalid +@@ -670,7 +679,8 @@ section [%2d] '%s': symbol %zu: invalid else { name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); @@ -902,7 +902,7 @@ } if (sym->st_shndx == SHN_XINDEX) -@@ -999,9 +1009,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1018,9 +1028,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Shdr rcshdr_mem; const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); @@ -916,7 +916,7 @@ { /* Found the dynamic section. Look through it. */ Elf_Data *d = elf_getdata (scn, NULL); -@@ -1011,7 +1023,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1030,7 +1042,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); @@ -927,7 +927,7 @@ if (dyn->d_tag == DT_RELCOUNT) { -@@ -1025,7 +1039,9 @@ section [%2d] '%s': DT_RELCOUNT used for +@@ -1044,7 +1058,9 @@ section [%2d] '%s': DT_RELCOUNT used for /* Does the number specified number of relative relocations exceed the total number of relocations? */ @@ -938,7 +938,7 @@ ERROR (gettext ("\ section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), idx, section_name (ebl, idx), -@@ -1185,7 +1201,8 @@ section [%2d] '%s': no relocations for m +@@ -1204,7 +1220,8 @@ section [%2d] '%s': no relocations for m } } @@ -948,7 +948,7 @@ ERROR (gettext (reltype == ELF_T_RELA ? "\ section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\ section [%2d] '%s': section entry size does not match ElfXX_Rel\n"), -@@ -1408,7 +1425,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G +@@ -1427,7 +1444,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -958,7 +958,7 @@ { GElf_Rela rela_mem; GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1458,7 +1476,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE +@@ -1477,7 +1495,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -968,7 +968,7 @@ { GElf_Rel rel_mem; GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1561,7 +1580,8 @@ section [%2d] '%s': referenced as string +@@ -1580,7 +1599,8 @@ section [%2d] '%s': referenced as string shdr->sh_link, section_name (ebl, shdr->sh_link), idx, section_name (ebl, idx)); @@ -978,7 +978,7 @@ ERROR (gettext ("\ section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), idx, section_name (ebl, idx)); -@@ -1571,7 +1591,7 @@ section [%2d] '%s': section entry size d +@@ -1590,7 +1610,7 @@ section [%2d] '%s': section entry size d idx, section_name (ebl, idx)); bool non_null_warned = false; @@ -987,7 +987,7 @@ { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1852,6 +1872,8 @@ section [%2d] '%s': entry size does not +@@ -1871,6 +1891,8 @@ section [%2d] '%s': entry size does not idx, section_name (ebl, idx)); if (symshdr != NULL @@ -996,7 +996,7 @@ && (shdr->sh_size / shdr->sh_entsize < symshdr->sh_size / symshdr->sh_entsize)) ERROR (gettext ("\ -@@ -1878,6 +1900,12 @@ section [%2d] '%s': extended section ind +@@ -1897,6 +1919,12 @@ section [%2d] '%s': extended section ind } Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); @@ -1009,7 +1009,7 @@ if (*((Elf32_Word *) data->d_buf) != 0) ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1920,7 +1948,7 @@ section [%2d] '%s': hash table section i +@@ -1939,7 +1967,7 @@ section [%2d] '%s': hash table section i size_t maxidx = nchain; @@ -1018,7 +1018,7 @@ { size_t symsize = symshdr->sh_size / symshdr->sh_entsize; -@@ -1931,18 +1959,28 @@ section [%2d] '%s': hash table section i +@@ -1950,18 +1978,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1049,7 +1049,7 @@ } -@@ -1972,18 +2010,28 @@ section [%2d] '%s': hash table section i +@@ -1991,18 +2029,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1081,7 +1081,7 @@ } -@@ -2008,7 +2056,7 @@ section [%2d] '%s': bitmask size not pow +@@ -2027,7 +2075,7 @@ section [%2d] '%s': bitmask size not pow if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) { ERROR (gettext ("\ @@ -1090,7 +1090,7 @@ idx, section_name (ebl, idx), (long int) shdr->sh_size, (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); return; -@@ -2680,8 +2728,9 @@ section [%2d] '%s' refers in sh_link to +@@ -2699,8 +2747,9 @@ section [%2d] '%s' refers in sh_link to /* The number of elements in the version symbol table must be the same as the number of symbols. */ @@ -1104,7 +1104,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1136,6 +1136,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1146,6 +1146,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1113,7 +1113,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1148,8 +1150,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1158,8 +1160,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G data->d_size / sizeof (Elf32_Word) - 1), elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), @@ -1124,7 +1124,7 @@ ?: gettext (""), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1300,7 +1302,8 @@ static void +@@ -1310,7 +1312,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1134,7 +1134,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1315,6 +1318,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1325,6 +1328,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1146,7 +1146,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1324,9 +1332,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1334,9 +1342,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1157,7 +1157,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1826,6 +1832,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1919,6 +1925,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1171,7 +1171,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1836,15 +1849,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1929,15 +1942,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1188,7 +1188,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2080,7 +2090,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2173,7 +2183,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1203,7 +1203,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2091,9 +2107,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2184,9 +2200,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1214,7 +1214,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2146,8 +2160,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2239,8 +2253,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1230,7 +1230,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2159,9 +2179,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2252,9 +2272,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1241,7 +1241,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2423,8 +2441,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2516,8 +2534,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1257,7 +1257,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2436,9 +2460,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2529,9 +2553,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1268,7 +1268,7 @@ /* Now we can finally look at the actual contents of this section. */ for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -2490,7 +2512,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2583,7 +2605,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1287,7 +1287,7 @@ printf (ngettext ("\ \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2503,9 +2535,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2596,9 +2628,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1298,7 +1298,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4107,6 +4137,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4231,6 +4261,16 @@ print_debug_aranges_section (Dwfl_Module return; } diff --git a/elfutils.spec b/elfutils.spec index 7b51df8..d89ea92 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,4 +1,4 @@ -%define eu_version 0.141 +%define eu_version 0.142 %define eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -27,7 +27,7 @@ Version: %{eu_version} %if !%{compat} Release: %{eu_release}%{?dist} %else -Release: 0.%{eu_release}.1 +Release: 0.%{eu_release} %endif License: GPLv2 with exceptions Group: Development/Tools @@ -276,6 +276,18 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Tue Jul 28 2009 Roland McGrath - 0.142-1 +- Update to 0.142 + - libelf: Bug fix in filling gaps between sections. (#512840) + - libelf: Add elf_getshdrnum alias for elf_getshnum and elf_getshdrstrndx + alias for elf_getshstrndx and deprecate original names. + - libebl, elflint: Add support for STB_GNU_UNIQUE. (#511436) + - readelf: Add -N option, speeds up DWARF printing + without address->name lookups. (#505347) + - libdw: Add support for decoding DWARF CFI into location description form. + Handle some new DWARF 3 expression operations previously omitted. + Basic handling of some new encodings slated for DWARF 4. + * Thu Apr 23 2009 Roland McGrath - 0.141-1 - Update to 0.141 - libebl: sparc backend fixes (#490585) diff --git a/sources b/sources index 7e662e2..bb6eb1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d0fe5651c0de1fd28e7dd006effe7d1 elfutils-0.141.tar.bz2 +03ce3616fa6a347c3156ee5f74985ea7 elfutils-0.142.tar.bz2