From 16b8cae54ad29d51736320a266fdb15c925fc38f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:47:34 +0000 Subject: [PATCH 01/10] Initialize branch F-12 for elfutils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 5f896cd010096e931103abdc56bee44cca618a47 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:57 +0000 Subject: [PATCH 02/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fd81fdf..dc8c895 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ UPSTREAM_FILES = $(NAME)-$(VERSION).tar.bz2 upstream:; define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e37a49c838b1968f26a38ef1b8a91fff5b4f9ae0 Mon Sep 17 00:00:00 2001 From: roland Date: Fri, 15 Jan 2010 04:04:34 +0000 Subject: [PATCH 03/10] Update to 0.144 --- .cvsignore | 2 +- elfutils-0.143.tar.bz2.sig | Bin 72 -> 0 bytes elfutils-0.144.tar.bz2.sig | Bin 0 -> 72 bytes elfutils-portability.patch | 91 +++++++++++++++------ elfutils-robustify.patch | 163 +++++++++++++++++++------------------ elfutils.spec | 45 ++++++---- sources | 2 +- 7 files changed, 180 insertions(+), 123 deletions(-) delete mode 100644 elfutils-0.143.tar.bz2.sig create mode 100644 elfutils-0.144.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index 1eaff27..d5c255e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.143.tar.bz2 +elfutils-0.144.tar.bz2 diff --git a/elfutils-0.143.tar.bz2.sig b/elfutils-0.143.tar.bz2.sig deleted file mode 100644 index ed3e06ffe92272babadc2fbef8a1ea4adafe97ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!p`^p8yI85ZWlhI(h#@ba9XXpufAOB>MrYz`fs1Z=fo< e496Z-O#q;iFj0UiC}5ZWlhI(h#@bn^fJo4z`yWUE literal 0 HcmV?d00001 diff --git a/elfutils-portability.patch b/elfutils-portability.patch index 471e3f9..8649d5e 100644 --- a/elfutils-portability.patch +++ b/elfutils-portability.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -57,6 +57,10 @@ +@@ -78,6 +78,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 -@@ -384,6 +388,11 @@ +@@ -405,6 +409,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -406,6 +415,9 @@ +@@ -427,6 +436,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -101,7 +101,15 @@ # XXX Should not be needed... --- elfutils/ChangeLog +++ elfutils/ChangeLog -@@ -6,6 +6,10 @@ +@@ -1,3 +1,7 @@ ++2009-11-22 Roland McGrath ++ ++ * configure.ac: Use sed and expr instead of modern bash extensions. ++ + 2009-09-21 Ulrich Drepper + + * configure.ac: Update for more modern autoconf. +@@ -6,6 +10,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -112,7 +120,7 @@ 2009-04-19 Roland McGrath * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -17,6 +21,8 @@ +@@ -17,6 +25,8 @@ 2009-01-23 Roland McGrath @@ -121,7 +129,7 @@ * 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 @@ +@@ -97,6 +107,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -132,7 +140,7 @@ 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -144,6 +154,17 @@ +@@ -144,6 +158,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -425,6 +433,24 @@ fi +@@ -5460,7 +5670,7 @@ ac_config_files="$ac_config_files versio + + # 1.234 -> 1234 + case "$PACKAGE_VERSION" in +-[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; ++[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; + *) { { $as_echo "$as_me:$LINENO: error: confused by version number '$PACKAGE_VERSION'" >&5 + $as_echo "$as_me: error: confused by version number '$PACKAGE_VERSION'" >&2;} + { (exit 1); exit 1; }; } ;; +@@ -5495,7 +5705,7 @@ $as_echo "$as_me: error: confused by ver + esac + + # Round up to the next release API (x.y) version. +-eu_version=$[($eu_version + 999) / 1000] ++eu_version=`expr \( $eu_version + 999 \) / 1000` + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure --- elfutils/configure.ac +++ elfutils/configure.ac @@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"]) @@ -494,6 +520,23 @@ LOCALEDIR=$datadir AC_SUBST(LOCALEDIR) +@@ -259,7 +310,7 @@ AC_SUBST([eu_version]) + + # 1.234 -> 1234 + case "$PACKAGE_VERSION" in +-[[0-9]].*) eu_version="${PACKAGE_VERSION/./}" ;; ++[[0-9]].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; + *) AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;; + esac + case "$eu_version" in +@@ -288,6 +339,6 @@ case "$eu_version" in + esac + + # Round up to the next release API (x.y) version. +-[eu_version=$[($eu_version + 999) / 1000]] ++eu_version=`expr \( $eu_version + 999 \) / 1000` + + AC_OUTPUT --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog @@ -4,6 +4,9 @@ @@ -728,7 +771,7 @@ @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -20,6 +20,10 @@ +@@ -49,6 +49,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -739,7 +782,7 @@ 2009-08-10 Roland McGrath * dwarf_getscopevar.c: Use dwarf_diename. -@@ -788,6 +792,11 @@ +@@ -817,6 +821,11 @@ 2005-05-31 Roland McGrath @@ -753,7 +796,7 @@ --- elfutils/libdw/libdw.h +++ elfutils/libdw/libdw.h -@@ -809,7 +809,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( +@@ -814,7 +814,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( /* Inline optimizations. */ @@ -783,7 +826,7 @@ --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -186,6 +186,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -187,6 +187,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -791,7 +834,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -215,6 +216,7 @@ SHELL = @SHELL@ +@@ -216,6 +217,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -799,7 +842,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -273,9 +275,10 @@ top_builddir = @top_builddir@ +@@ -274,9 +276,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zip_LIBS = @zip_LIBS@ @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ @@ -814,7 +857,7 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1139,6 +1139,11 @@ +@@ -1165,6 +1165,11 @@ 2005-07-21 Roland McGrath @@ -875,7 +918,7 @@ --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -603,6 +603,11 @@ +@@ -620,6 +620,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -936,7 +979,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -580,6 +580,11 @@ +@@ -614,6 +614,11 @@ * elf.h: Update from glibc. @@ -1071,7 +1114,7 @@ /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -7,8 +7,16 @@ +@@ -59,8 +59,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -1088,7 +1131,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -172,6 +180,8 @@ +@@ -224,6 +232,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -1097,7 +1140,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -355,6 +365,11 @@ +@@ -407,6 +417,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1109,7 +1152,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -606,6 +621,8 @@ +@@ -658,6 +673,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1118,7 +1161,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -1045,6 +1062,10 @@ +@@ -1097,6 +1114,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1129,7 +1172,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1121,6 +1142,10 @@ +@@ -1173,6 +1194,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1140,7 +1183,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1469,6 +1494,11 @@ +@@ -1521,6 +1546,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1259,7 +1302,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7594,7 +7594,7 @@ dump_archive_index (Elf *elf, const char +@@ -7661,7 +7661,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)) diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index 2e162ed..10741aa 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,6 +1,6 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -572,6 +572,49 @@ +@@ -606,6 +606,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. @@ -52,14 +52,7 @@ * elf.h: Update again. --- elfutils/libelf/elf32_getphdr.c +++ elfutils/libelf/elf32_getphdr.c -@@ -1,5 +1,5 @@ - /* Get ELF program header table. -- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc. -+ Copyright (C) 1998-2009 Red Hat, Inc. - This file is part of Red Hat elfutils. - Written by Ulrich Drepper , 1998. - -@@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf) +@@ -107,6 +107,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf) if (elf->map_address != NULL) { @@ -114,8 +107,8 @@ /* All the data is already mapped. If we could use it --- elfutils/libelf/elf32_newphdr.c +++ elfutils/libelf/elf32_newphdr.c -@@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count) - else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count +@@ -135,6 +135,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count) + || count == PN_XNUM || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL) { + if (unlikely (count > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Phdr)))) @@ -129,7 +122,7 @@ result = (ElfW2(LIBELFBITS,Phdr) *) --- elfutils/libelf/elf32_updatefile.c +++ elfutils/libelf/elf32_updatefile.c -@@ -220,6 +220,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf +@@ -223,6 +223,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf /* Write all the sections. Well, only those which are modified. */ if (shnum > 0) { @@ -139,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 -@@ -636,6 +639,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf +@@ -645,6 +648,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf /* Write all the sections. Well, only those which are modified. */ if (shnum > 0) { @@ -152,13 +145,6 @@ xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR]; --- elfutils/libelf/elf_begin.c +++ elfutils/libelf/elf_begin.c -@@ -1,5 +1,5 @@ - /* Create descriptor for processing file. -- Copyright (C) 1998-2005, 2006, 2007, 2008 Red Hat, Inc. -+ Copyright (C) 1998-2009 Red Hat, Inc. - This file is part of Red Hat elfutils. - Written by Ulrich Drepper , 1998. - @@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c if (unlikely (result == 0) && ehdr.e32->e_shoff != 0) @@ -192,10 +178,10 @@ + else if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf64_Shdr))) + return NULL; + - /* We can now allocate the memory. */ - Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent, - ELF_K_ELF, scncnt * sizeof (Elf_Scn)); -@@ -318,13 +329,30 @@ file_read_elf (int fildes, void *map_add + /* We can now allocate the memory. Even if there are no section headers, + we allocate space for a zeroth section in case we need it later. */ + const size_t scnmax = (scncnt ?: (cmd == ELF_C_RDWR || cmd == ELF_C_RDWR_MMAP) +@@ -324,13 +335,33 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf32.ehdr = ehdr; @@ -211,22 +197,30 @@ + } elf->state.elf32.shdr = (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff); +- if (ehdr->e_phnum > 0) +- /* Assign a value only if there really is a program +- header. Otherwise the value remains NULL. */ +- elf->state.elf32.phdr +- = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff); + - if (ehdr->e_phnum > 0) ++ size_t phnum = ehdr->e_phnum; ++ if (phnum == PN_XNUM && scncnt > 0) ++ phnum = elf->state.elf32.shdr[0].sh_info; ++ if (phnum > 0) + { - /* Assign a value only if there really is a program - header. Otherwise the value remains NULL. */ ++ /* Assign a value only if there really is a program ++ header. Otherwise the value remains NULL. */ + if (unlikely (ehdr->e_phoff >= maxsize) + || unlikely (maxsize - ehdr->e_phoff -+ < ehdr->e_phnum * sizeof (Elf32_Phdr))) ++ < phnum * sizeof (Elf32_Phdr))) + goto free_and_out; - elf->state.elf32.phdr - = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff); ++ elf->state.elf32.phdr ++ = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff); + } for (size_t cnt = 0; cnt < scncnt; ++cnt) { -@@ -406,13 +434,26 @@ file_read_elf (int fildes, void *map_add +@@ -409,13 +440,28 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf64.ehdr = ehdr; @@ -237,18 +231,25 @@ + goto free_and_out; elf->state.elf64.shdr = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff); +- if (ehdr->e_phnum > 0) +- /* Assign a value only if there really is a program +- header. Otherwise the value remains NULL. */ +- elf->state.elf64.phdr +- = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff); + - if (ehdr->e_phnum > 0) ++ size_t phnum = ehdr->e_phnum; ++ if (phnum == PN_XNUM && scncnt > 0) ++ phnum = elf->state.elf64.shdr[0].sh_info; ++ if (phnum > 0) + { - /* Assign a value only if there really is a program - header. Otherwise the value remains NULL. */ ++ /* Assign a value only if there really is a program ++ header. Otherwise the value remains NULL. */ + if (unlikely (ehdr->e_phoff >= maxsize) + || unlikely (ehdr->e_phoff -+ + ehdr->e_phnum -+ * sizeof (Elf32_Phdr) > maxsize)) ++ + phnum * sizeof (Elf32_Phdr) > maxsize)) + goto free_and_out; - elf->state.elf64.phdr - = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff); ++ elf->state.elf64.phdr ++ = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff); + } for (size_t cnt = 0; cnt < scncnt; ++cnt) @@ -893,7 +894,7 @@ return 0; --- elfutils/libelf/libelfP.h +++ elfutils/libelf/libelfP.h -@@ -606,4 +606,8 @@ extern uint32_t __libelf_crc32 (uint32_t +@@ -608,4 +608,8 @@ 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) @@ -904,7 +905,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1457,6 +1457,16 @@ +@@ -1509,6 +1509,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -921,7 +922,7 @@ 2005-06-08 Roland McGrath * readelf.c (print_ops): Add consts. -@@ -1502,6 +1512,19 @@ +@@ -1554,6 +1564,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -943,17 +944,18 @@ * strip.c (handle_elf): Don't translate hash and versym data formats, --- elfutils/src/elflint.c +++ elfutils/src/elflint.c -@@ -130,6 +130,9 @@ static uint32_t shstrndx; +@@ -130,6 +130,10 @@ static uint32_t shstrndx; /* Array to count references in section groups. */ static int *scnref; -+/* Number of sections. */ ++/* Numbers of sections and program headers. */ +static unsigned int shnum; ++static unsigned int phnum; + int main (int argc, char *argv[]) -@@ -318,10 +321,19 @@ section_name (Ebl *ebl, int idx) +@@ -318,10 +322,19 @@ section_name (Ebl *ebl, int idx) { GElf_Shdr shdr_mem; GElf_Shdr *shdr; @@ -974,18 +976,19 @@ } -@@ -343,10 +355,6 @@ static const int valid_e_machine[] = +@@ -343,11 +356,6 @@ static const int valid_e_machine[] = (sizeof (valid_e_machine) / sizeof (valid_e_machine[0])) --/* Number of sections. */ +-/* Numbers of sections and program headers. */ -static unsigned int shnum; +-static unsigned int phnum; - - static void check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size) { -@@ -612,7 +620,8 @@ section [%2d] '%s': symbol table cannot +@@ -631,7 +639,8 @@ section [%2d] '%s': symbol table cannot } } @@ -995,7 +998,7 @@ ERROR (gettext ("\ section [%2u] '%s': entry size is does not match ElfXX_Sym\n"), idx, section_name (ebl, idx)); -@@ -650,7 +659,7 @@ section [%2d] '%s': XINDEX for zeroth en +@@ -669,7 +678,7 @@ section [%2d] '%s': XINDEX for zeroth en xndxscnidx, section_name (ebl, xndxscnidx)); } @@ -1004,7 +1007,7 @@ { sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx); if (sym == NULL) -@@ -670,7 +679,8 @@ section [%2d] '%s': symbol %zu: invalid +@@ -689,7 +698,8 @@ section [%2d] '%s': symbol %zu: invalid else { name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); @@ -1014,7 +1017,7 @@ } if (sym->st_shndx == SHN_XINDEX) -@@ -1018,9 +1028,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1037,9 +1047,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Shdr rcshdr_mem; const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); @@ -1028,7 +1031,7 @@ { /* Found the dynamic section. Look through it. */ Elf_Data *d = elf_getdata (scn, NULL); -@@ -1030,7 +1042,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1049,7 +1061,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); @@ -1039,7 +1042,7 @@ if (dyn->d_tag == DT_RELCOUNT) { -@@ -1044,7 +1058,9 @@ section [%2d] '%s': DT_RELCOUNT used for +@@ -1063,7 +1077,9 @@ section [%2d] '%s': DT_RELCOUNT used for /* Does the number specified number of relative relocations exceed the total number of relocations? */ @@ -1050,7 +1053,7 @@ ERROR (gettext ("\ section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), idx, section_name (ebl, idx), -@@ -1204,7 +1220,8 @@ section [%2d] '%s': no relocations for m +@@ -1223,7 +1239,8 @@ section [%2d] '%s': no relocations for m } } @@ -1060,7 +1063,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"), -@@ -1427,7 +1444,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G +@@ -1446,7 +1463,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1070,7 +1073,7 @@ { GElf_Rela rela_mem; GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1477,7 +1495,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE +@@ -1496,7 +1514,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1080,7 +1083,7 @@ { GElf_Rel rel_mem; GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1580,7 +1599,8 @@ section [%2d] '%s': referenced as string +@@ -1599,7 +1618,8 @@ section [%2d] '%s': referenced as string shdr->sh_link, section_name (ebl, shdr->sh_link), idx, section_name (ebl, idx)); @@ -1090,7 +1093,7 @@ ERROR (gettext ("\ section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), idx, section_name (ebl, idx)); -@@ -1590,7 +1610,7 @@ section [%2d] '%s': section entry size d +@@ -1609,7 +1629,7 @@ section [%2d] '%s': section entry size d idx, section_name (ebl, idx)); bool non_null_warned = false; @@ -1099,7 +1102,7 @@ { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1871,6 +1891,8 @@ section [%2d] '%s': entry size does not +@@ -1890,6 +1910,8 @@ section [%2d] '%s': entry size does not idx, section_name (ebl, idx)); if (symshdr != NULL @@ -1108,7 +1111,7 @@ && (shdr->sh_size / shdr->sh_entsize < symshdr->sh_size / symshdr->sh_entsize)) ERROR (gettext ("\ -@@ -1897,6 +1919,12 @@ section [%2d] '%s': extended section ind +@@ -1916,6 +1938,12 @@ section [%2d] '%s': extended section ind } Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); @@ -1121,7 +1124,7 @@ if (*((Elf32_Word *) data->d_buf) != 0) ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1939,7 +1967,7 @@ section [%2d] '%s': hash table section i +@@ -1958,7 +1986,7 @@ section [%2d] '%s': hash table section i size_t maxidx = nchain; @@ -1130,7 +1133,7 @@ { size_t symsize = symshdr->sh_size / symshdr->sh_entsize; -@@ -1950,18 +1978,28 @@ section [%2d] '%s': hash table section i +@@ -1969,18 +1997,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1161,7 +1164,7 @@ } -@@ -1991,18 +2029,28 @@ section [%2d] '%s': hash table section i +@@ -2010,18 +2048,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1193,7 +1196,7 @@ } -@@ -2027,7 +2075,7 @@ section [%2d] '%s': bitmask size not pow +@@ -2046,7 +2094,7 @@ section [%2d] '%s': bitmask size not pow if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) { ERROR (gettext ("\ @@ -1202,7 +1205,7 @@ idx, section_name (ebl, idx), (long int) shdr->sh_size, (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); return; -@@ -2699,8 +2747,9 @@ section [%2d] '%s' refers in sh_link to +@@ -2718,8 +2766,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. */ @@ -1216,7 +1219,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1146,6 +1146,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1169,6 +1169,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1225,7 +1228,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1158,8 +1160,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1181,8 +1183,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), @@ -1236,7 +1239,7 @@ ?: gettext (""), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1310,7 +1312,8 @@ static void +@@ -1333,7 +1335,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1246,7 +1249,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1325,6 +1328,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1348,6 +1351,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1258,7 +1261,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1334,9 +1342,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1357,9 +1365,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1269,7 +1272,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1919,6 +1925,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1942,6 +1948,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1283,7 +1286,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1929,15 +1942,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1952,15 +1965,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1300,7 +1303,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2173,7 +2183,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2196,7 +2206,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1315,7 +1318,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2184,9 +2200,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2207,9 +2223,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1326,7 +1329,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2239,8 +2253,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2262,8 +2276,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1342,7 +1345,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2252,9 +2272,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2275,9 +2295,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1353,7 +1356,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2516,8 +2534,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2539,8 +2557,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1369,7 +1372,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2529,9 +2553,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2552,9 +2576,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1380,7 +1383,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) -@@ -2583,7 +2605,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2606,7 +2628,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1399,7 +1402,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", "\ -@@ -2596,9 +2628,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2619,9 +2651,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1410,7 +1413,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4231,6 +4261,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4262,6 +4292,16 @@ print_debug_aranges_section (Dwfl_Module return; } diff --git a/elfutils.spec b/elfutils.spec index 9bf5d83..ff891ff 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,24 +1,24 @@ -%define eu_version 0.143 -%define eu_release 1 +%global eu_version 0.144 +%global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} -%define compat 1 +%global compat 1 %else -%define compat 0 +%global compat 0 %endif %if 0%{?fedora} >= 8 -%define scanf_has_m 1 +%global scanf_has_m 1 %endif %if 0%{?rhel} >= 6 -%define scanf_has_m 1 +%global scanf_has_m 1 %endif %if 0%{?fedora} >= 7 -%define separate_devel_static 1 +%global separate_devel_static 1 %endif %if 0%{?rhel} >= 6 -%define separate_devel_static 1 +%global separate_devel_static 1 %endif Summary: A collection of utilities and DSOs to handle compiled objects @@ -50,20 +50,20 @@ BuildRequires: glibc-headers >= 2.3.4-11 BuildRequires: gcc >= 3.2 %endif -%define use_zlib 0 +%global use_zlib 0 %if 0%{?fedora} >= 5 -%define use_zlib 1 +%global use_zlib 1 %endif %if 0%{?rhel} >= 5 -%define use_zlib 1 +%global use_zlib 1 %endif -%define use_xz 0 +%global use_xz 0 %if 0%{?fedora} >= 10 -%define use_xz 1 +%global use_xz 1 %endif %if 0%{?rhel} >= 6 -%define use_xz 1 +%global use_xz 1 %endif %if %{use_zlib} @@ -75,8 +75,8 @@ BuildRequires: bzip2-devel BuildRequires: xz-devel %endif -%define _gnu %{nil} -%define _program_prefix eu- +%global _gnu %{nil} +%global _program_prefix eu- %description Elfutils is a collection of utilities, including ld (a linker), @@ -195,7 +195,10 @@ RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wall/} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D__NO_INLINE__" %endif -%configure CFLAGS="$RPM_OPT_FLAGS -fexceptions" +%configure CFLAGS="$RPM_OPT_FLAGS -fexceptions" || { + cat config.log + exit 2 +} make -s %{?_smp_mflags} %install @@ -288,6 +291,14 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Thu Jan 14 2010 Roland McGrath - 0.144-1 +- Update to 0.144 + - libdw: New function dwarf_aggregate_size for computing (constant) type + sizes, including array_type cases with nontrivial calculation. + - readelf: Don't give errors for missing info under -a. + Handle Linux "VMCOREINFO" notes under -n. +- Resolves: RHBZ #527004, RHBZ #530704, RHBZ #550858 + * Mon Sep 21 2009 Roland McGrath - 0.143-1 - Update to 0.143 - libdw: Various convenience functions for individual attributes now use diff --git a/sources b/sources index c92f137..e1facde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06e35c348e78dec58f6aeb51bd397760 elfutils-0.143.tar.bz2 +e2c49192043656e52f671ffa8a788e09 elfutils-0.144.tar.bz2 From 279414eb7a38483c9046970e31ae230d5bf339d6 Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 24 Feb 2010 03:19:34 +0000 Subject: [PATCH 04/10] Update to 0.145 --- .cvsignore | 2 +- elfutils-0.145.tar.bz2.sig | Bin 0 -> 72 bytes elfutils-portability.patch | 524 ++++++++++++------------------------- elfutils-robustify.patch | 126 ++++----- elfutils.spec | 14 +- sources | 2 +- 6 files changed, 244 insertions(+), 424 deletions(-) create mode 100644 elfutils-0.145.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index d5c255e..c9b4168 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.144.tar.bz2 +elfutils-0.145.tar.bz2 diff --git a/elfutils-0.145.tar.bz2.sig b/elfutils-0.145.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..696a7460b7284a1467c90497be5edc9a54f2357e GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0!xIHw*U$W5ZWlhI(h#@bmOZ4pHZVV9Asu-J}!>0N2$bk e?(`AY0|213?UHFw!>C5h|EC5O7<>H#gT-;5lpV7G literal 0 HcmV?d00001 diff --git a/elfutils-portability.patch b/elfutils-portability.patch index 8649d5e..94874ed 100644 --- a/elfutils-portability.patch +++ b/elfutils-portability.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -78,6 +78,10 @@ +@@ -88,6 +88,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 -@@ -405,6 +409,11 @@ +@@ -415,6 +419,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -427,6 +436,9 @@ +@@ -437,6 +446,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -35,34 +35,18 @@ --- 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,$^) \ +@@ -103,7 +103,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a + $(LINK) -shared -o $(@:.map=.so) \ + -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--version-script,$(@:.so=.map) \ - -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... + libebl_i386.so: $(cpu_i386) --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -70,7 +54,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -192,6 +193,7 @@ SHELL = @SHELL@ +@@ -193,6 +194,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -78,27 +62,24 @@ 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,$^) \ +@@ -255,7 +257,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = +@@ -693,7 +695,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a + $(LINK) -shared -o $(@:.map=.so) \ + -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--version-script,$(@:.so=.map) \ - -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... + libebl_i386.so: $(cpu_i386) --- elfutils/ChangeLog +++ elfutils/ChangeLog @@ -1,3 +1,7 @@ @@ -158,6 +139,24 @@ 2005-05-19 Roland McGrath * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. +--- elfutils/config/eu.am ++++ elfutils/config/eu.am +@@ -25,11 +25,14 @@ + ## . + ## + ++WEXTRA = @WEXTRA@ ++LD_AS_NEEDED = @LD_AS_NEEDED@ ++ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H + INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ + $(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) \ + $($(*F)_CFLAGS) + --- elfutils/config/Makefile.in +++ elfutils/config/Makefile.in @@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -539,7 +538,7 @@ AC_OUTPUT --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -4,6 +4,9 @@ +@@ -8,6 +8,9 @@ 2009-01-23 Roland McGrath @@ -549,7 +548,7 @@ * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper -@@ -60,6 +63,11 @@ +@@ -64,6 +67,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -581,26 +580,9 @@ #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@ +@@ -99,6 +99,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -608,7 +590,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -127,6 +128,7 @@ SHELL = @SHELL@ +@@ -128,6 +129,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -616,21 +598,18 @@ 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 \ +@@ -189,7 +191,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libelf + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) -fpic + @MUDFLAP_FALSE@libmudflap = --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog -@@ -63,6 +63,11 @@ +@@ -67,6 +67,11 @@ * asm_error.c: Add new error ASM_E_IOERROR. * libasmP.h: Add ASM_E_IOERROR definition. @@ -642,26 +621,9 @@ 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@ +@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -669,7 +631,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -174,6 +175,7 @@ SHELL = @SHELL@ +@@ -176,6 +177,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -677,21 +639,18 @@ 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 +@@ -238,7 +240,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(top_srcdir)/libdw + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libcpu/ChangeLog +++ elfutils/libcpu/ChangeLog -@@ -5,6 +5,9 @@ +@@ -9,6 +9,9 @@ 2009-01-23 Roland McGrath @@ -701,7 +660,7 @@ * Makefile.am (i386_parse_CFLAGS): Use quotes around command substitution that can produce leading whitespace. -@@ -334,6 +337,11 @@ +@@ -338,6 +341,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -723,21 +682,9 @@ } } 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@ +@@ -116,6 +116,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -745,7 +692,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( * dwarf_getscopevar.c: Use dwarf_diename. -@@ -817,6 +821,11 @@ +@@ -825,6 +829,11 @@ 2005-05-31 Roland McGrath @@ -805,28 +745,9 @@ /* 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 -@@ -187,6 +187,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@ @@ -834,7 +755,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -216,6 +217,7 @@ SHELL = @SHELL@ +@@ -217,6 +218,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -842,22 +763,18 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ YACC = @YACC@ -@@ -274,9 +276,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))) +@@ -278,7 +280,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libelf + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) $(am__append_2) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1165,6 +1165,11 @@ +@@ -1184,6 +1184,11 @@ 2005-07-21 Roland McGrath @@ -869,26 +786,9 @@ * 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@ +@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -896,7 +796,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -208,6 +209,7 @@ SHELL = @SHELL@ +@@ -210,6 +211,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -904,21 +804,18 @@ 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 - +@@ -272,7 +274,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libdw + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = --- elfutils/libebl/ChangeLog +++ elfutils/libebl/ChangeLog -@@ -620,6 +620,11 @@ +@@ -624,6 +624,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -930,26 +827,9 @@ 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@ +@@ -143,6 +143,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -957,7 +837,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -170,6 +171,7 @@ SHELL = @SHELL@ +@@ -172,6 +173,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -965,21 +845,18 @@ 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 - +@@ -234,7 +236,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libasm + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) -fpic + @MUDFLAP_FALSE@libmudflap = --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -614,6 +614,11 @@ +@@ -624,6 +624,11 @@ * elf.h: Update from glibc. @@ -1011,28 +888,9 @@ : (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@ +@@ -189,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1040,7 +898,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -217,6 +218,7 @@ SHELL = @SHELL@ +@@ -218,6 +219,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -1048,19 +906,15 @@ 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) +@@ -278,7 +280,7 @@ zip_LIBS = @zip_LIBS@ + INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) $(am__append_2) + @MUDFLAP_FALSE@libmudflap = --- elfutils/m4/Makefile.in +++ elfutils/m4/Makefile.in @@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -1114,7 +968,7 @@ /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -59,8 +59,16 @@ +@@ -82,8 +82,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -1131,7 +985,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -224,6 +232,8 @@ +@@ -247,6 +255,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -1140,7 +994,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -407,6 +417,11 @@ +@@ -430,6 +440,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1152,7 +1006,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -658,6 +673,8 @@ +@@ -681,6 +696,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1161,7 +1015,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -1097,6 +1114,10 @@ +@@ -1120,6 +1137,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1172,7 +1026,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1173,6 +1194,10 @@ +@@ -1196,6 +1217,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1183,7 +1037,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1521,6 +1546,11 @@ +@@ -1544,6 +1569,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1229,24 +1083,7 @@ #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 +@@ -99,6 +99,9 @@ addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this ldgeneric_no_Wunused = yes @@ -1258,7 +1095,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/Makefile.in +++ elfutils/src/Makefile.in -@@ -226,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -228,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1266,7 +1103,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -255,6 +256,7 @@ SHELL = @SHELL@ +@@ -257,6 +258,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1274,22 +1111,15 @@ 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 \ +@@ -320,7 +322,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + -I$(srcdir)/../libasm + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = @@ -367,6 +369,9 @@ strings_no_Wformat = yes addr2line_no_Wformat = yes # XXX While the file is not finished, don't warn about this @@ -1302,7 +1132,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7661,7 +7661,7 @@ dump_archive_index (Elf *elf, const char +@@ -7644,7 +7644,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)) @@ -1352,7 +1182,7 @@ if (unlikely (elfmap == MAP_FAILED)) --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -52,6 +52,12 @@ +@@ -53,6 +53,12 @@ #include #include @@ -1365,7 +1195,7 @@ /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); -@@ -300,8 +306,18 @@ process_file (const char *fname) +@@ -301,8 +307,18 @@ process_file (const char *fname) /* If we have to preserve the timestamp, we need it in the format utimes() understands. */ @@ -1384,7 +1214,7 @@ } /* Open the file. */ -@@ -1746,7 +1762,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1747,7 +1763,7 @@ handle_elf (int fd, Elf *elf, const char /* If requested, preserve the timestamp. */ if (tvp != NULL) { @@ -1393,7 +1223,7 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), -@@ -1803,7 +1819,7 @@ handle_ar (int fd, Elf *elf, const char +@@ -1804,7 +1820,7 @@ handle_ar (int fd, Elf *elf, const char if (tvp != NULL) { @@ -1404,7 +1234,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -124,6 +124,8 @@ +@@ -130,6 +130,8 @@ 2008-01-21 Roland McGrath @@ -1413,7 +1243,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -832,6 +834,11 @@ +@@ -838,6 +840,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1436,27 +1266,9 @@ { 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@ +@@ -367,6 +367,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1464,7 +1276,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -388,6 +389,7 @@ SHELL = @SHELL@ +@@ -396,6 +397,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1472,16 +1284,12 @@ 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 +@@ -456,7 +458,7 @@ zip_LIBS = @zip_LIBS@ + INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2) + AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(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) $($(*F)_CFLAGS) \ + $(am__append_1) + @MUDFLAP_FALSE@libmudflap = diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index 10741aa..8e6f545 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,6 +1,6 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -606,6 +606,49 @@ +@@ -616,6 +616,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. @@ -220,7 +220,7 @@ for (size_t cnt = 0; cnt < scncnt; ++cnt) { -@@ -409,13 +440,28 @@ file_read_elf (int fildes, void *map_add +@@ -412,13 +443,28 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf64.ehdr = ehdr; @@ -905,7 +905,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1509,6 +1509,16 @@ +@@ -1532,6 +1532,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -922,7 +922,7 @@ 2005-06-08 Roland McGrath * readelf.c (print_ops): Add consts. -@@ -1554,6 +1564,19 @@ +@@ -1577,6 +1587,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -944,7 +944,7 @@ * strip.c (handle_elf): Don't translate hash and versym data formats, --- elfutils/src/elflint.c +++ elfutils/src/elflint.c -@@ -130,6 +130,10 @@ static uint32_t shstrndx; +@@ -131,6 +131,10 @@ static uint32_t shstrndx; /* Array to count references in section groups. */ static int *scnref; @@ -955,7 +955,7 @@ int main (int argc, char *argv[]) -@@ -318,10 +322,19 @@ section_name (Ebl *ebl, int idx) +@@ -319,10 +323,19 @@ section_name (Ebl *ebl, int idx) { GElf_Shdr shdr_mem; GElf_Shdr *shdr; @@ -976,7 +976,7 @@ } -@@ -343,11 +356,6 @@ static const int valid_e_machine[] = +@@ -344,11 +357,6 @@ static const int valid_e_machine[] = (sizeof (valid_e_machine) / sizeof (valid_e_machine[0])) @@ -988,7 +988,7 @@ static void check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size) { -@@ -631,7 +639,8 @@ section [%2d] '%s': symbol table cannot +@@ -632,7 +640,8 @@ section [%2d] '%s': symbol table cannot } } @@ -998,7 +998,7 @@ ERROR (gettext ("\ section [%2u] '%s': entry size is does not match ElfXX_Sym\n"), idx, section_name (ebl, idx)); -@@ -669,7 +678,7 @@ section [%2d] '%s': XINDEX for zeroth en +@@ -670,7 +679,7 @@ section [%2d] '%s': XINDEX for zeroth en xndxscnidx, section_name (ebl, xndxscnidx)); } @@ -1007,7 +1007,7 @@ { sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx); if (sym == NULL) -@@ -689,7 +698,8 @@ section [%2d] '%s': symbol %zu: invalid +@@ -690,7 +699,8 @@ section [%2d] '%s': symbol %zu: invalid else { name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); @@ -1017,7 +1017,7 @@ } if (sym->st_shndx == SHN_XINDEX) -@@ -1037,9 +1047,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1038,9 +1048,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Shdr rcshdr_mem; const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); @@ -1031,7 +1031,7 @@ { /* Found the dynamic section. Look through it. */ Elf_Data *d = elf_getdata (scn, NULL); -@@ -1049,7 +1061,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1050,7 +1062,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); @@ -1042,7 +1042,7 @@ if (dyn->d_tag == DT_RELCOUNT) { -@@ -1063,7 +1077,9 @@ section [%2d] '%s': DT_RELCOUNT used for +@@ -1064,7 +1078,9 @@ section [%2d] '%s': DT_RELCOUNT used for /* Does the number specified number of relative relocations exceed the total number of relocations? */ @@ -1053,7 +1053,7 @@ ERROR (gettext ("\ section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), idx, section_name (ebl, idx), -@@ -1223,7 +1239,8 @@ section [%2d] '%s': no relocations for m +@@ -1224,7 +1240,8 @@ section [%2d] '%s': no relocations for m } } @@ -1063,7 +1063,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"), -@@ -1446,7 +1463,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G +@@ -1447,7 +1464,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1073,7 +1073,7 @@ { GElf_Rela rela_mem; GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1496,7 +1514,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE +@@ -1497,7 +1515,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1083,7 +1083,7 @@ { GElf_Rel rel_mem; GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1599,7 +1618,8 @@ section [%2d] '%s': referenced as string +@@ -1600,7 +1619,8 @@ section [%2d] '%s': referenced as string shdr->sh_link, section_name (ebl, shdr->sh_link), idx, section_name (ebl, idx)); @@ -1093,7 +1093,7 @@ ERROR (gettext ("\ section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), idx, section_name (ebl, idx)); -@@ -1609,7 +1629,7 @@ section [%2d] '%s': section entry size d +@@ -1610,7 +1630,7 @@ section [%2d] '%s': section entry size d idx, section_name (ebl, idx)); bool non_null_warned = false; @@ -1102,7 +1102,7 @@ { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1890,6 +1910,8 @@ section [%2d] '%s': entry size does not +@@ -1891,6 +1911,8 @@ section [%2d] '%s': entry size does not idx, section_name (ebl, idx)); if (symshdr != NULL @@ -1111,7 +1111,7 @@ && (shdr->sh_size / shdr->sh_entsize < symshdr->sh_size / symshdr->sh_entsize)) ERROR (gettext ("\ -@@ -1916,6 +1938,12 @@ section [%2d] '%s': extended section ind +@@ -1917,6 +1939,12 @@ section [%2d] '%s': extended section ind } Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); @@ -1124,7 +1124,7 @@ if (*((Elf32_Word *) data->d_buf) != 0) ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1958,7 +1986,7 @@ section [%2d] '%s': hash table section i +@@ -1959,7 +1987,7 @@ section [%2d] '%s': hash table section i size_t maxidx = nchain; @@ -1133,7 +1133,7 @@ { size_t symsize = symshdr->sh_size / symshdr->sh_entsize; -@@ -1969,18 +1997,28 @@ section [%2d] '%s': hash table section i +@@ -1970,18 +1998,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1164,7 +1164,7 @@ } -@@ -2010,18 +2048,28 @@ section [%2d] '%s': hash table section i +@@ -2011,18 +2049,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1196,7 +1196,7 @@ } -@@ -2046,7 +2094,7 @@ section [%2d] '%s': bitmask size not pow +@@ -2047,7 +2095,7 @@ section [%2d] '%s': bitmask size not pow if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) { ERROR (gettext ("\ @@ -1205,7 +1205,7 @@ idx, section_name (ebl, idx), (long int) shdr->sh_size, (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); return; -@@ -2718,8 +2766,9 @@ section [%2d] '%s' refers in sh_link to +@@ -2719,8 +2767,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. */ @@ -1219,7 +1219,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1169,6 +1169,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1170,6 +1170,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1228,7 +1228,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1181,8 +1183,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1182,8 +1184,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), @@ -1239,7 +1239,7 @@ ?: gettext (""), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1333,7 +1335,8 @@ static void +@@ -1334,7 +1336,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1249,7 +1249,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1348,6 +1351,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1349,6 +1352,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1261,7 +1261,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1357,9 +1365,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1358,9 +1366,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1272,7 +1272,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1942,6 +1948,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1943,6 +1949,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1286,7 +1286,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1952,15 +1965,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1953,15 +1966,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1303,7 +1303,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2196,7 +2206,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2197,7 +2207,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1318,7 +1318,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2207,9 +2223,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2208,9 +2224,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1329,7 +1329,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2262,8 +2276,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2263,8 +2277,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1345,7 +1345,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2275,9 +2295,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2276,9 +2296,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1356,7 +1356,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2539,8 +2557,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2540,8 +2558,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1372,7 +1372,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2552,9 +2576,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2553,9 +2577,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1383,7 +1383,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) -@@ -2606,7 +2628,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2607,7 +2629,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1402,7 +1402,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", "\ -@@ -2619,9 +2651,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2620,9 +2652,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1413,7 +1413,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4262,6 +4292,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4263,6 +4293,16 @@ print_debug_aranges_section (Dwfl_Module return; } @@ -1432,7 +1432,7 @@ "\ --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -544,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -545,6 +545,11 @@ handle_elf (int fd, Elf *elf, const char goto fail_close; } @@ -1444,7 +1444,7 @@ /* Storage for section information. We leave room for two more entries since we unconditionally create a section header string table. Maybe some weird tool created an ELF file without one. -@@ -565,7 +570,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -566,7 +571,7 @@ handle_elf (int fd, Elf *elf, const char { /* This should always be true (i.e., there should not be any holes in the numbering). */ @@ -1453,7 +1453,7 @@ shdr_info[cnt].scn = scn; -@@ -578,6 +583,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -579,6 +584,7 @@ handle_elf (int fd, Elf *elf, const char shdr_info[cnt].shdr.sh_name); if (shdr_info[cnt].name == NULL) { @@ -1461,7 +1461,7 @@ error (0, 0, gettext ("illformed file '%s'"), fname); goto fail_close; } -@@ -587,6 +593,8 @@ handle_elf (int fd, Elf *elf, const char +@@ -588,6 +594,8 @@ handle_elf (int fd, Elf *elf, const char /* Remember the shdr.sh_link value. */ shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link; @@ -1470,7 +1470,7 @@ /* Sections in files other than relocatable object files which are not loaded can be freely moved by us. In relocatable -@@ -599,7 +607,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -600,7 +608,7 @@ handle_elf (int fd, Elf *elf, const char appropriate reference. */ if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX)) { @@ -1479,7 +1479,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt; } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP)) -@@ -616,7 +624,12 @@ handle_elf (int fd, Elf *elf, const char +@@ -617,7 +625,12 @@ handle_elf (int fd, Elf *elf, const char for (inner = 1; inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word); ++inner) @@ -1492,7 +1492,7 @@ if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0)) /* If the section group contains only one element and this -@@ -627,7 +640,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -628,7 +641,7 @@ handle_elf (int fd, Elf *elf, const char } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)) { @@ -1501,7 +1501,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt; } -@@ -635,7 +648,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -636,7 +649,7 @@ handle_elf (int fd, Elf *elf, const char discarded right away. */ if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0) { @@ -1510,7 +1510,7 @@ if (shdr_info[shdr_info[cnt].group_idx].idx == 0) { -@@ -710,11 +723,15 @@ handle_elf (int fd, Elf *elf, const char +@@ -711,11 +724,15 @@ handle_elf (int fd, Elf *elf, const char { /* If a relocation section is marked as being removed make sure the section it is relocating is removed, too. */ @@ -1528,7 +1528,7 @@ if (shdr_info[cnt].idx == 1) { -@@ -741,7 +758,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -742,7 +759,7 @@ handle_elf (int fd, Elf *elf, const char if (shdr_info[cnt].symtab_idx != 0 && shdr_info[shdr_info[cnt].symtab_idx].data == NULL) { @@ -1537,7 +1537,7 @@ shdr_info[shdr_info[cnt].symtab_idx].data = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, -@@ -781,6 +798,9 @@ handle_elf (int fd, Elf *elf, const char +@@ -782,6 +799,9 @@ handle_elf (int fd, Elf *elf, const char else if (scnidx == SHN_XINDEX) scnidx = xndx; @@ -1547,7 +1547,7 @@ if (shdr_info[scnidx].idx == 0) /* This symbol table has a real symbol in a discarded section. So preserve the -@@ -811,12 +831,16 @@ handle_elf (int fd, Elf *elf, const char +@@ -812,12 +832,16 @@ handle_elf (int fd, Elf *elf, const char } /* Handle references through sh_info. */ @@ -1566,7 +1566,7 @@ /* Mark the section as investigated. */ shdr_info[cnt].idx = 2; -@@ -955,7 +979,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -956,7 +980,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"), elf_errmsg (-1)); @@ -1575,7 +1575,7 @@ /* Add this name to the section header string table. */ shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0); -@@ -992,7 +1016,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -993,7 +1017,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1584,7 +1584,7 @@ shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn); if (shdr_info[cnt].data == NULL) -@@ -1048,7 +1072,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1049,7 +1073,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1593,7 +1593,7 @@ /* Finalize the string table and fill in the correct indices in the section headers. */ -@@ -1138,20 +1162,20 @@ handle_elf (int fd, Elf *elf, const char +@@ -1139,20 +1163,20 @@ handle_elf (int fd, Elf *elf, const char shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, NULL); @@ -1617,7 +1617,7 @@ >= shdr_info[cnt].data->d_size / elsize); } -@@ -1206,7 +1230,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1207,7 +1231,7 @@ handle_elf (int fd, Elf *elf, const char sec = shdr_info[sym->st_shndx].idx; else { @@ -1626,7 +1626,7 @@ sec = shdr_info[xshndx].idx; } -@@ -1227,7 +1251,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1228,7 +1252,7 @@ handle_elf (int fd, Elf *elf, const char nxshndx = sec; } @@ -1635,7 +1635,7 @@ if ((inner != destidx || nshndx != sym->st_shndx || (shndxdata != NULL && nxshndx != xshndx)) -@@ -1251,7 +1275,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1252,7 +1276,7 @@ handle_elf (int fd, Elf *elf, const char || shdr_info[cnt].debug_data == NULL) /* This is a section symbol for a section which has been removed. */ @@ -1644,7 +1644,7 @@ } if (destidx != inner) -@@ -1438,11 +1462,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1439,11 +1463,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); @@ -1658,7 +1658,7 @@ size_t hidx = elf_hash (name) % nbucket; if (bucket[hidx] == 0) -@@ -1461,7 +1485,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1462,7 +1486,7 @@ handle_elf (int fd, Elf *elf, const char else { /* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */ @@ -1667,7 +1667,7 @@ == sizeof (Elf64_Xword)); Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf; -@@ -1492,11 +1516,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1493,11 +1517,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); diff --git a/elfutils.spec b/elfutils.spec index ff891ff..1379fb8 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,4 +1,4 @@ -%global eu_version 0.144 +%global eu_version 0.145 %global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -291,6 +291,18 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Tue Feb 23 2010 Roland McGrath - 0.145-1 +- Update to 0.145 + - Fix build with --disable-dependency-tracking. (#564646) + - Fix build with most recent glibc headers. + - libdw: Fix CFI decoding. (#563528) + - libdwfl: Fix address bias returned by CFI accessors. (#563528) + Fix core file module layout identification. (#559836) + - readelf: Fix CFI decoding. + +* Fri Jan 15 2010 Roland McGrath - 0.144-2 +- Fix sloppy #include's breaking build with F-13 glibc. + * Thu Jan 14 2010 Roland McGrath - 0.144-1 - Update to 0.144 - libdw: New function dwarf_aggregate_size for computing (constant) type diff --git a/sources b/sources index e1facde..edceb98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2c49192043656e52f671ffa8a788e09 elfutils-0.144.tar.bz2 +af325a39c5a534de5b15c2a727a4e203 elfutils-0.145.tar.bz2 From 34505abb478fe451eb00c74ec24e15ed975f2e04 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 22 Apr 2010 00:05:05 +0000 Subject: [PATCH 05/10] Update to 0.146 --- .cvsignore | 2 +- elfutils-0.145.tar.bz2.sig | Bin 72 -> 0 bytes elfutils-0.146.tar.bz2.sig | Bin 0 -> 72 bytes elfutils-portability.patch | 131 +++++++++++++++++++------------------ elfutils-robustify.patch | 122 ++++++++++++---------------------- elfutils.spec | 17 +++-- sources | 2 +- 7 files changed, 123 insertions(+), 151 deletions(-) delete mode 100644 elfutils-0.145.tar.bz2.sig create mode 100644 elfutils-0.146.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index c9b4168..fb62ec8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.145.tar.bz2 +elfutils-0.146.tar.bz2 diff --git a/elfutils-0.145.tar.bz2.sig b/elfutils-0.145.tar.bz2.sig deleted file mode 100644 index 696a7460b7284a1467c90497be5edc9a54f2357e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!xIHw*U$W5ZWlhI(h#@bmOZ4pHZVV9Asu-J}!>0N2$bk e?(`AY0|213?UHFw!>C5h|EC5O7<>H#gT-;5lpV7G diff --git a/elfutils-0.146.tar.bz2.sig b/elfutils-0.146.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..6f597355d3983c56cb1dafd2065b5506e4a1e184 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0!z<~G5`t*5ZWlhI(h#@bZt-oo+vDfKK4_0_w&@MLhye8 eVaN@&JpiDaiK6TYuqax1NfMU8k&vt6FTNFta~%5s literal 0 HcmV?d00001 diff --git a/elfutils-portability.patch b/elfutils-portability.patch index 94874ed..497afec 100644 --- a/elfutils-portability.patch +++ b/elfutils-portability.patch @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -88,6 +88,10 @@ +@@ -106,6 +106,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 -@@ -415,6 +419,11 @@ +@@ -433,6 +437,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -23,7 +23,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -437,6 +446,9 @@ +@@ -455,6 +464,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -46,7 +46,7 @@ libebl_i386.so: $(cpu_i386) --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -61,8 +61,8 @@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -255,7 +257,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +@@ -256,7 +258,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -71,7 +71,7 @@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ $(am__append_1) @MUDFLAP_FALSE@libmudflap = -@@ -693,7 +695,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a +@@ -697,7 +699,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(LINK) -shared -o $(@:.map=.so) \ -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map) \ @@ -82,7 +82,10 @@ libebl_i386.so: $(cpu_i386) --- elfutils/ChangeLog +++ elfutils/ChangeLog -@@ -1,3 +1,7 @@ +@@ -2,6 +2,10 @@ + + * configure.ac (LOCALEDIR, DATADIRNAME): Removed. + +2009-11-22 Roland McGrath + + * configure.ac: Use sed and expr instead of modern bash extensions. @@ -90,7 +93,7 @@ 2009-09-21 Ulrich Drepper * configure.ac: Update for more modern autoconf. -@@ -6,6 +10,10 @@ +@@ -10,6 +14,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -101,7 +104,7 @@ 2009-04-19 Roland McGrath * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -17,6 +25,8 @@ +@@ -21,6 +29,8 @@ 2009-01-23 Roland McGrath @@ -110,7 +113,7 @@ * 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 +107,10 @@ +@@ -101,6 +111,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -121,7 +124,7 @@ 2005-11-18 Roland McGrath * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -144,6 +158,17 @@ +@@ -148,6 +162,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -148,7 +151,7 @@ +WEXTRA = @WEXTRA@ +LD_AS_NEEDED = @LD_AS_NEEDED@ + - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ $(if $($(*F)_no_Werror),,-Werror) \ @@ -167,14 +170,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -105,6 +106,7 @@ SHELL = @SHELL@ +@@ -104,6 +105,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/config.h.in +++ elfutils/config.h.in @@ -1,5 +1,8 @@ @@ -186,7 +189,7 @@ /* $libdir subdirectory containing libebl modules. */ #undef LIBEBL_SUBDIR -@@ -55,4 +58,7 @@ +@@ -52,4 +55,7 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -196,10 +199,10 @@ #include --- elfutils/configure +++ elfutils/configure -@@ -646,6 +646,8 @@ NATIVE_LD_FALSE +@@ -646,6 +646,8 @@ NEVER_TRUE + base_cpu + NATIVE_LD_FALSE NATIVE_LD_TRUE - DATADIRNAME - LOCALEDIR +LD_AS_NEEDED +WEXTRA LEXLIB @@ -432,7 +435,7 @@ fi -@@ -5460,7 +5670,7 @@ ac_config_files="$ac_config_files versio +@@ -5454,7 +5664,7 @@ ac_config_files="$ac_config_files versio # 1.234 -> 1234 case "$PACKAGE_VERSION" in @@ -441,7 +444,7 @@ *) { { $as_echo "$as_me:$LINENO: error: confused by version number '$PACKAGE_VERSION'" >&5 $as_echo "$as_me: error: confused by version number '$PACKAGE_VERSION'" >&2;} { (exit 1); exit 1; }; } ;; -@@ -5495,7 +5705,7 @@ $as_echo "$as_me: error: confused by ver +@@ -5489,7 +5699,7 @@ $as_echo "$as_me: error: confused by ver esac # Round up to the next release API (x.y) version. @@ -517,9 +520,9 @@ + [AC_DEFINE([__thread], [/* empty: no multi-thread support */], + [Stubbed out if missing compiler support.])])]) - LOCALEDIR=$datadir - AC_SUBST(LOCALEDIR) -@@ -259,7 +310,7 @@ AC_SUBST([eu_version]) + dnl This test must come as early as possible after the compiler configuration + dnl tests, because the choice of the file model can (in principle) affect +@@ -251,7 +302,7 @@ AC_SUBST([eu_version]) # 1.234 -> 1234 case "$PACKAGE_VERSION" in @@ -528,7 +531,7 @@ *) AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;; esac case "$eu_version" in -@@ -288,6 +339,6 @@ case "$eu_version" in +@@ -280,6 +331,6 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -590,14 +593,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -128,6 +129,7 @@ SHELL = @SHELL@ +@@ -127,6 +128,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -189,7 +191,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libelf AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -631,14 +634,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -176,6 +177,7 @@ SHELL = @SHELL@ +@@ -175,6 +176,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -238,7 +240,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(top_srcdir)/libdw AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -692,14 +695,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( * dwarf_getscopevar.c: Use dwarf_diename. -@@ -825,6 +829,11 @@ +@@ -829,6 +833,11 @@ 2005-05-31 Roland McGrath @@ -747,7 +750,7 @@ dwarf_whatattr (Dwarf_Attribute *attr) --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -188,6 +188,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -189,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -762,8 +765,8 @@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -278,7 +280,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +@@ -279,7 +281,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libelf AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -774,7 +777,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1184,6 +1184,11 @@ +@@ -1201,6 +1201,11 @@ 2005-07-21 Roland McGrath @@ -796,14 +799,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -210,6 +211,7 @@ SHELL = @SHELL@ +@@ -209,6 +210,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -272,7 +274,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libdw AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -837,14 +840,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -172,6 +173,7 @@ SHELL = @SHELL@ +@@ -171,6 +172,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -234,7 +236,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libasm AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -856,7 +859,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -624,6 +624,11 @@ +@@ -651,6 +651,11 @@ * elf.h: Update from glibc. @@ -898,14 +901,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -218,6 +219,7 @@ SHELL = @SHELL@ +@@ -217,6 +218,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -278,7 +280,7 @@ zip_LIBS = @zip_LIBS@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -925,14 +928,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -104,6 +105,7 @@ SHELL = @SHELL@ +@@ -103,6 +104,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/Makefile.in +++ elfutils/Makefile.in @@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -943,14 +946,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -184,6 +185,7 @@ SHELL = @SHELL@ +@@ -183,6 +184,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/src/addr2line.c +++ elfutils/src/addr2line.c @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl @@ -968,7 +971,7 @@ /* It was symbol+offset. */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -82,8 +82,16 @@ +@@ -98,8 +98,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -985,7 +988,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -247,6 +255,8 @@ +@@ -263,6 +271,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -994,7 +997,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -430,6 +440,11 @@ +@@ -446,6 +456,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1006,7 +1009,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -681,6 +696,8 @@ +@@ -697,6 +712,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1015,7 +1018,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -1120,6 +1137,10 @@ +@@ -1136,6 +1153,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1026,7 +1029,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1196,6 +1217,10 @@ +@@ -1212,6 +1233,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1037,7 +1040,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1544,6 +1569,11 @@ +@@ -1560,6 +1585,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1103,14 +1106,14 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -257,6 +258,7 @@ SHELL = @SHELL@ +@@ -256,6 +257,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -d + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -320,7 +322,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libasm AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ @@ -1132,7 +1135,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7644,7 +7644,7 @@ dump_archive_index (Elf *elf, const char +@@ -7655,7 +7655,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)) @@ -1234,7 +1237,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -130,6 +130,8 @@ +@@ -145,6 +145,8 @@ 2008-01-21 Roland McGrath @@ -1243,7 +1246,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -838,6 +840,11 @@ +@@ -853,6 +855,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1268,7 +1271,7 @@ case 0: --- elfutils/tests/Makefile.in +++ elfutils/tests/Makefile.in -@@ -367,6 +367,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -372,6 +372,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -1276,15 +1279,15 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -396,6 +397,7 @@ SHELL = @SHELL@ +@@ -400,6 +401,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WEXTRA = @WEXTRA@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -456,7 +458,7 @@ zip_LIBS = @zip_LIBS@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +@@ -461,7 +463,7 @@ zip_LIBS = @zip_LIBS@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2) AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index 8e6f545..e1356d4 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,24 +1,9 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -616,6 +616,49 @@ +@@ -643,10 +643,53 @@ 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. -+2005-05-17 Jakub Jelinek -+ -+ * elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header -+ table fits into object's bounds. -+ * elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to -+ elf->map_address. Check if first section header fits into object's -+ bounds. -+ * elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): -+ Check if section header table fits into object's bounds. -+ * elf_begin.c (get_shnum): Ensure section headers fits into -+ object's bounds. -+ (file_read_elf): Make sure scncnt is small enough to allocate both -+ ElfXX_Shdr and Elf_Scn array. Make sure section and program header -+ tables fit into object's bounds. Avoid memory leak on failure. -+ +2005-05-14 Jakub Jelinek + + * libelfP.h (INVALID_NDX): Define. @@ -50,9 +35,28 @@ 2005-05-11 Ulrich Drepper * elf.h: Update again. + ++2005-05-17 Jakub Jelinek ++ ++ * elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header ++ table fits into object's bounds. ++ * elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to ++ elf->map_address. Check if first section header fits into object's ++ bounds. ++ * elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): ++ Check if section header table fits into object's bounds. ++ * elf_begin.c (get_shnum): Ensure section headers fits into ++ object's bounds. ++ (file_read_elf): Make sure scncnt is small enough to allocate both ++ ElfXX_Shdr and Elf_Scn array. Make sure section and program header ++ tables fit into object's bounds. Avoid memory leak on failure. ++ + 2005-05-09 Ulrich Drepper + + * elf.h: Update from glibc. --- elfutils/libelf/elf32_getphdr.c +++ elfutils/libelf/elf32_getphdr.c -@@ -107,6 +107,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf) +@@ -114,6 +114,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf) if (elf->map_address != NULL) { @@ -181,7 +185,7 @@ /* We can now allocate the memory. Even if there are no section headers, we allocate space for a zeroth section in case we need it later. */ const size_t scnmax = (scncnt ?: (cmd == ELF_C_RDWR || cmd == ELF_C_RDWR_MMAP) -@@ -324,13 +335,33 @@ file_read_elf (int fildes, void *map_add +@@ -324,6 +335,16 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf32.ehdr = ehdr; @@ -197,30 +201,8 @@ + } elf->state.elf32.shdr = (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff); -- if (ehdr->e_phnum > 0) -- /* Assign a value only if there really is a program -- header. Otherwise the value remains NULL. */ -- elf->state.elf32.phdr -- = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff); -+ -+ size_t phnum = ehdr->e_phnum; -+ if (phnum == PN_XNUM && scncnt > 0) -+ phnum = elf->state.elf32.shdr[0].sh_info; -+ if (phnum > 0) -+ { -+ /* Assign a value only if there really is a program -+ header. Otherwise the value remains NULL. */ -+ if (unlikely (ehdr->e_phoff >= maxsize) -+ || unlikely (maxsize - ehdr->e_phoff -+ < phnum * sizeof (Elf32_Phdr))) -+ goto free_and_out; -+ elf->state.elf32.phdr -+ = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff); -+ } - for (size_t cnt = 0; cnt < scncnt; ++cnt) - { -@@ -412,13 +443,28 @@ file_read_elf (int fildes, void *map_add +@@ -410,6 +431,11 @@ file_read_elf (int fildes, void *map_add { /* We can use the mmapped memory. */ elf->state.elf64.ehdr = ehdr; @@ -231,29 +213,7 @@ + goto free_and_out; elf->state.elf64.shdr = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff); -- if (ehdr->e_phnum > 0) -- /* Assign a value only if there really is a program -- header. Otherwise the value remains NULL. */ -- elf->state.elf64.phdr -- = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff); -+ -+ size_t phnum = ehdr->e_phnum; -+ if (phnum == PN_XNUM && scncnt > 0) -+ phnum = elf->state.elf64.shdr[0].sh_info; -+ if (phnum > 0) -+ { -+ /* Assign a value only if there really is a program -+ header. Otherwise the value remains NULL. */ -+ if (unlikely (ehdr->e_phoff >= maxsize) -+ || unlikely (ehdr->e_phoff -+ + phnum * sizeof (Elf32_Phdr) > maxsize)) -+ goto free_and_out; -+ elf->state.elf64.phdr -+ = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff); -+ } - for (size_t cnt = 0; cnt < scncnt; ++cnt) - { --- elfutils/libelf/elf_getarsym.c +++ elfutils/libelf/elf_getarsym.c @@ -179,6 +179,9 @@ elf_getarsym (elf, ptr) @@ -905,7 +865,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1532,6 +1532,16 @@ +@@ -1548,6 +1548,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -922,7 +882,7 @@ 2005-06-08 Roland McGrath * readelf.c (print_ops): Add consts. -@@ -1577,6 +1587,19 @@ +@@ -1593,6 +1603,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -1219,7 +1179,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1170,6 +1170,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1171,6 +1171,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1228,7 +1188,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1182,8 +1184,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1183,8 +1185,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), @@ -1239,7 +1199,7 @@ ?: gettext (""), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1334,7 +1336,8 @@ static void +@@ -1335,7 +1337,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1249,7 +1209,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1349,6 +1352,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1350,6 +1353,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1261,7 +1221,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1358,9 +1366,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1359,9 +1367,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1272,7 +1232,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1943,6 +1949,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1944,6 +1950,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1286,7 +1246,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1953,15 +1966,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1954,15 +1967,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1303,7 +1263,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2197,7 +2207,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2198,7 +2208,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1318,7 +1278,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2208,9 +2224,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2209,9 +2225,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1329,7 +1289,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2263,8 +2277,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2264,8 +2278,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1345,7 +1305,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2276,9 +2296,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2277,9 +2297,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1356,7 +1316,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2540,8 +2558,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2541,8 +2559,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1372,7 +1332,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2553,9 +2577,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2554,9 +2578,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1383,7 +1343,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) -@@ -2607,7 +2629,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2608,7 +2630,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1402,7 +1362,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", "\ -@@ -2620,9 +2652,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2621,9 +2653,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1413,7 +1373,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4263,6 +4293,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4265,6 +4295,16 @@ print_debug_aranges_section (Dwfl_Module return; } diff --git a/elfutils.spec b/elfutils.spec index 1379fb8..3d144cc 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,4 +1,4 @@ -%global eu_version 0.145 +%global eu_version 0.146 %global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -38,7 +38,7 @@ Patch2: elfutils-portability.patch Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Requires: elfutils-libs-%{_arch} = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gettext BuildRequires: bison >= 1.875 BuildRequires: flex >= 2.5.4a BuildRequires: bzip2 @@ -213,6 +213,8 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so* rm -f .%{_bindir}/eu-ld ) +%find_lang %{name} + %check make -s check @@ -229,7 +231,7 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc README TODO +%doc COPYING README TODO %{_bindir}/eu-addr2line %{_bindir}/eu-ar %{_bindir}/eu-elfcmp @@ -274,7 +276,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libasm.a %{_libdir}/libdw.a -%files libelf +%files -f %{name}.lang libelf %defattr(-,root,root) %{_libdir}/libelf-%{version}.so %{_libdir}/libelf.so.* @@ -291,6 +293,13 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Wed Apr 21 2010 Roland McGrath - 0.146-1 +- Update to 0.146 + - libdwfl: New function dwfl_core_file_report. + - libelf: Fix handling of phdrs in truncated file. (#577310) + - libdwfl: Fix infinite loop handling clobbered link_map. (#576379) +- Package translations. + * Tue Feb 23 2010 Roland McGrath - 0.145-1 - Update to 0.145 - Fix build with --disable-dependency-tracking. (#564646) diff --git a/sources b/sources index edceb98..0ebe170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af325a39c5a534de5b15c2a727a4e203 elfutils-0.145.tar.bz2 +7f5f5adf811ebc4f36a10bf6bd6d2c61 elfutils-0.146.tar.bz2 From 6c83feac6ffb48c65fa645fe93e1f3ddd147db38 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 4 May 2010 01:52:39 +0000 Subject: [PATCH 06/10] Update to 0.147 --- .cvsignore | 2 +- elfutils-0.146.tar.bz2.sig | Bin 72 -> 0 bytes elfutils-0.147.tar.bz2.sig | Bin 0 -> 72 bytes elfutils-portability.patch | 10 +++++----- elfutils.spec | 5 ++++- sources | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 elfutils-0.146.tar.bz2.sig create mode 100644 elfutils-0.147.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index fb62ec8..3758108 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.146.tar.bz2 +elfutils-0.147.tar.bz2 diff --git a/elfutils-0.146.tar.bz2.sig b/elfutils-0.146.tar.bz2.sig deleted file mode 100644 index 6f597355d3983c56cb1dafd2065b5506e4a1e184..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!z<~G5`t*5ZWlhI(h#@bZt-oo+vDfKK4_0_w&@MLhye8 eVaN@&JpiDaiK6TYuqax1NfMU8k&vt6FTNFta~%5s diff --git a/elfutils-0.147.tar.bz2.sig b/elfutils-0.147.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..3ddbcc13c449e50aa78e23c628f93dc3a8a406b1 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0!!aL9smjn5ZWlhI(h#@bdAgao;f0y9^hk(8W2kO1#5&F eCr~naSpc7W9Y!`ZnxSL * dwarf_getscopevar.c: Use dwarf_diename. -@@ -829,6 +833,11 @@ +@@ -850,6 +854,11 @@ 2005-05-31 Roland McGrath @@ -777,7 +777,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1201,6 +1201,11 @@ +@@ -1207,6 +1207,11 @@ 2005-07-21 Roland McGrath @@ -1237,7 +1237,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -145,6 +145,8 @@ +@@ -150,6 +150,8 @@ 2008-01-21 Roland McGrath @@ -1246,7 +1246,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -853,6 +855,11 @@ +@@ -858,6 +860,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. diff --git a/elfutils.spec b/elfutils.spec index 3d144cc..d6bb226 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,4 +1,4 @@ -%global eu_version 0.146 +%global eu_version 0.147 %global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -293,6 +293,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Mon May 3 2010 Roland McGrath - 0.147-1 +- Update to 0.147 + * Wed Apr 21 2010 Roland McGrath - 0.146-1 - Update to 0.146 - libdwfl: New function dwfl_core_file_report. diff --git a/sources b/sources index 0ebe170..cb86e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f5f5adf811ebc4f36a10bf6bd6d2c61 elfutils-0.146.tar.bz2 +ccb6bba1d96c096f1b5dbd34444554a3 elfutils-0.147.tar.bz2 From 5601600074b795f2531bef346049dae6b624010d Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 4 May 2010 01:56:30 +0000 Subject: [PATCH 07/10] Removed unused Makefile cruft of yore. --- Makefile | 38 --------------------- README.elfutils | 76 ----------------------------------------- systemtap-elfutils.repo | 5 --- 3 files changed, 119 deletions(-) delete mode 100644 README.elfutils delete mode 100644 systemtap-elfutils.repo diff --git a/Makefile b/Makefile index dc8c895..f318ff5 100644 --- a/Makefile +++ b/Makefile @@ -61,41 +61,3 @@ $(portable.srpm): elfutils-portable.spec $(patches) \ $(RPM_WITH_DIRS) --nodeps -bs $< portable-srpm: $(portable.srpm) - -portable-dist = 3.0E-scratch -portable-build = \ - $(redhat)/brewroot/packages/elfutils/$(VERSION)/$(portable-r) - -ifeq (,$(wildcard /mnt/redhat/brewroot/packages/elfutils)) -redhat = datadump.devel.redhat.com::redhat -rsync-to = devserv.devel.redhat.com:dist/elfutils/devel/systemtap-dist/ -build-dep = $(portable.srpm) -else -redhat = /mnt/redhat -$(portable-build): $(portable.srpm) - brew build $(BUILD_FLAGS) dist-$(portable-dist) $< -rsync-to = $(public) -build-dep = $(portable-build)/src/$(portable.srpm) -portable-build: $(portable-build) -$(build-dep): $(portable-build) -endif - -dist-files = README.elfutils systemtap-elfutils.repo -rsync-files = --exclude=tests --exclude=data $(portable-build)/ -public = sources.redhat.com:/sourceware/ftp/anonftp/pub/systemtap/elfutils/ - -RSYNC = RSYNC_RSH=ssh rsync - -systemtap-dist: $(build-dep) $(dist-files) - @mkdir -p $@ - $(RSYNC) -a --delete --progress -v $(rsync-files) systemtap-dist/ - ln $(dist-files) systemtap-dist/ - ln -v `rpm -qlp $<` systemtap-dist/ - -systemtap-dist-createrepo: systemtap-dist -ifneq ($(wildcard /usr/bin/createrepo),) - createrepo -q `cd $<; /bin/pwd` -endif - -systemtap-sync: systemtap-dist-createrepo - $(RSYNC) -az --delete --progress -v systemtap-dist/ $(rsync-to) diff --git a/README.elfutils b/README.elfutils deleted file mode 100644 index 730d93a..0000000 --- a/README.elfutils +++ /dev/null @@ -1,76 +0,0 @@ -THIS IS HERE ONLY TO SUPPORT SYSTEMTAP DEVELOPMENT. IT IS NOT FOR GENERAL USE. - -Building systemtap requires a recent development version of elfutils, -which provides libraries for making use of debugging information. - -This is unfinished work in active development. This code is not intended -for general consumption in its present form. Development of these -libraries is simultaneous with Systemtap development. The Systemtap code -will require new versions as things evolve; the systemtap.spec.in file in -the systemtap source tree should always indicate the minimum version of -elfutils libraries that will suffice. We will make an effort to make a -compatible version available here, that you can use for compiling Systemtap. - -Current elfutils can always be found in Fedora Core Development, AKA Rawhide. -If you are interested in the elfutils code in general or for any purpose -other than developing Systemtap, please see http://fedora.redhat.com/ about -getting involved with Fedora Core Development directly. - -To use the elfutils libraries to build Systemtap, you can either use -installed libraries, or you can build elfutils from source as part of the -systemtap build. To use installed libraries, you'll need to have the -current elfutils version installed on your system where the compiler will -find it with whatever build flags you pass systemtap's configure script. -Unless your system already has the current elfutils installed -(i.e. Rawhide), you'll have to install a nonstandard build either via RPM -or by hand with "make" as detailed below. To build the elfutils source -locally as part of the systemtap build, see systemtap's README about the ---with-elfutils=... option to systemtap's configure. - -You can find the rawhide rpms updated daily on a variety of sites -(see http://fedora.redhat.com/download/mirrors.html) under core/development. -What's distributed in this directory is made trivially from those same sources. - -The vanilla elfutils code, in elfutils-VERSION.tar.gz and what the rawhide -RPMs ordinarily build, can only be built using GCC 4 and a recent glibc. -Fedora Core 4 is the only released system meeting the requirements. - -To rebuild the rawhide src.rpm on an older system, you can use: - - rpmbuild --with compat --rebuild elfutils-VERSION-N.src.rpm - -The SRPMS/elfutils-VERSION-0.N.src.rpm provided here is exactly the same as -the elfutils-VERSION-N.src.rpm from Rawhide except that it doesn't require -that you specify --with compat to build on an older system. - -We have done this for you for a few architectures, and those RPMs are -available here. These were built on RHEL3, and so their requirements -should not be too demanding. We must remind you that this is unsupported, -pre-beta development code. Furthermore, these builds are completely -unofficial, unsupported, unsigned, unlikely to have been tested, -unequivocally not guaranteed not to ruin your whole day, and we really -cannot recommend that anyone install them on their system. Do so at your -own risk. All that said, here they is, and if you copy this file: - - ftp://sources.redhat.com/pub/systemtap/elfutils/systemtap-elfutils.repo - -into your /etc/yum.repos.d/ directory, then you can get them all with just: - - yum install elfutils-devel - - -To compile elfutils from source by hand, simply use elfutils-VERSION.tar.gz -and follow the usual procedure for GNU configure conventions. The patch -available here has to be applied before you can compile on an older system: - - tar xzf elfutils-VERSION.tar.gz - patch -p1 -d elfutils-VERSION < elfutils-portability.patch - cd elfutils-VERSION - ./configure --program-prefix=eu-devel- - make && make check && make install - -(That of course installs things under /usr/local, unlike the RPMs.) - - -Caveat emptor. Carpe noctem. -Reply to . diff --git a/systemtap-elfutils.repo b/systemtap-elfutils.repo deleted file mode 100644 index 96d326b..0000000 --- a/systemtap-elfutils.repo +++ /dev/null @@ -1,5 +0,0 @@ -[systemtap-elfutils] -name=FOR SYSTEMTAP DEVELOPMENT ONLY -baseurl=ftp://sources.redhat.com/pub/systemtap/elfutils/ -enabled=1 -gpgcheck=0 From 7ac64e9de6ad0e37a9d170166f08f3906538bad4 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 29 Jun 2010 04:34:43 +0000 Subject: [PATCH 08/10] Update to 0.148 --- .cvsignore | 2 +- elfutils-0.147.tar.bz2.sig | Bin 72 -> 0 bytes elfutils-0.148.tar.bz2.sig | Bin 0 -> 72 bytes elfutils-portability.patch | 287 +++++++++++++------------------------ elfutils-robustify.patch | 38 ++--- elfutils.spec | 73 +++++++--- sources | 2 +- 7 files changed, 178 insertions(+), 224 deletions(-) delete mode 100644 elfutils-0.147.tar.bz2.sig create mode 100644 elfutils-0.148.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index 3758108..650f54b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -elfutils-0.147.tar.bz2 +elfutils-0.148.tar.bz2 diff --git a/elfutils-0.147.tar.bz2.sig b/elfutils-0.147.tar.bz2.sig deleted file mode 100644 index 3ddbcc13c449e50aa78e23c628f93dc3a8a406b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!!aL9smjn5ZWlhI(h#@bdAgao;f0y9^hk(8W2kO1#5&F eCr~naSpc7W9Y!`ZnxSL{Y5ZWlhI(h#@bO0y-of+<1;$#8j?#-(eq8 e7!`{jkpQ5Sv?tR{YVvK`@Tzneo$?ysX --- elfutils/configure +++ elfutils/configure -@@ -646,6 +646,8 @@ NEVER_TRUE +@@ -602,6 +602,8 @@ NEVER_TRUE base_cpu NATIVE_LD_FALSE NATIVE_LD_TRUE @@ -208,67 +208,47 @@ LEXLIB LEX_OUTPUT_ROOT LEX -@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su +@@ -3852,6 +3854,130 @@ if test "x$ac_cv_c99" != xyes; then : + as_fn_error "gcc with C99 support required" "$LINENO" 5 fi - -+{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5 ++{ $as_echo "$as_me:${as_lineno-$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 ++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 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ +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 ++if ac_fn_c_try_compile "$LINENO"; 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 ++ 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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5 +$as_echo "$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 +else + WEXTRA=-W +fi + -+ -+{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5 ++{ $as_echo "$as_me:${as_lineno-$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 ++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 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +void foo (void) +{ @@ -278,45 +258,23 @@ +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 ++if ac_fn_c_try_compile "$LINENO"; 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 ++ 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 "$as_me:${as_lineno-$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 ++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 "$as_me:${as_lineno-$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 ++if test "${ac_cv_as_needed+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat > conftest.c <&5 ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } +then + ac_cv_as_needed=yes +else @@ -337,26 +295,21 @@ +fi +rm -f conftest* +fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5 +$as_echo "$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 +else + LD_AS_NEEDED= +fi + + -+ -+{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 +$as_echo_n "checking for __builtin_popcount... " >&6; } -+if test "${ac_cv_popcount+set}" = set; then ++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 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int @@ -367,84 +320,50 @@ + 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 ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_popcount=yes +else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_popcount=no ++ 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 ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext +fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5 +$as_echo "$ac_cv_popcount" >&6; } -+if test "x$ac_cv_popcount" = xyes; then ++if test "x$ac_cv_popcount" = xyes; then : + -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_BUILTIN_POPCOUNT 1 -+_ACEOF ++$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h + +fi + -+ - { $as_echo "$as_me:$LINENO: checking for __thread support" >&5 + { $as_echo "$as_me:${as_lineno-$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 + if test "${ac_cv_tls+set}" = set; then : +@@ -3888,7 +4014,13 @@ fi + { $as_echo "$as_me:${as_lineno-$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; }; } + if test "x$ac_cv_tls" != xyes; then : +- as_fn_error "__thread support required" "$LINENO" 5 ++ if test "$use_locks" = yes; then : ++ as_fn_error "--enable-thread-safety requires __thread support" "$LINENO" 5 +else + -+cat >>confdefs.h <<\_ACEOF -+#define __thread /* empty: no multi-thread support */ -+_ACEOF ++$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h + +fi -+ fi - -@@ -5454,7 +5664,7 @@ ac_config_files="$ac_config_files versio + # Check whether --enable-largefile was given. +@@ -4874,7 +5006,7 @@ ac_config_files="$ac_config_files versio # 1.234 -> 1234 case "$PACKAGE_VERSION" in -[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; +[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; - *) { { $as_echo "$as_me:$LINENO: error: confused by version number '$PACKAGE_VERSION'" >&5 - $as_echo "$as_me: error: confused by version number '$PACKAGE_VERSION'" >&2;} - { (exit 1); exit 1; }; } ;; -@@ -5489,7 +5699,7 @@ $as_echo "$as_me: error: confused by ver + *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; + esac + case "$eu_version" in +@@ -4903,7 +5035,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -541,7 +460,7 @@ AC_OUTPUT --- elfutils/lib/ChangeLog +++ elfutils/lib/ChangeLog -@@ -8,6 +8,9 @@ +@@ -14,6 +14,9 @@ 2009-01-23 Roland McGrath @@ -551,7 +470,7 @@ * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper -@@ -64,6 +67,11 @@ +@@ -70,6 +73,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -593,7 +512,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -127,6 +128,7 @@ SHELL = @SHELL@ +@@ -128,6 +129,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -601,7 +520,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -189,7 +191,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -190,7 +192,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libelf AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -634,7 +553,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -175,6 +176,7 @@ SHELL = @SHELL@ +@@ -176,6 +177,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -642,7 +561,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -238,7 +240,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -239,7 +241,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(top_srcdir)/libdw AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -695,7 +614,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = lex.$( * dwarf_getscopevar.c: Use dwarf_diename. -@@ -850,6 +854,11 @@ +@@ -1044,6 +1048,11 @@ 2005-05-31 Roland McGrath @@ -739,7 +658,7 @@ --- elfutils/libdw/libdw.h +++ elfutils/libdw/libdw.h -@@ -814,7 +814,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( +@@ -842,7 +842,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( /* Inline optimizations. */ @@ -750,7 +669,7 @@ dwarf_whatattr (Dwarf_Attribute *attr) --- elfutils/libdw/Makefile.in +++ elfutils/libdw/Makefile.in -@@ -189,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -191,6 +191,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -758,7 +677,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -217,6 +218,7 @@ SHELL = @SHELL@ +@@ -220,6 +221,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -766,7 +685,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -279,7 +281,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -282,7 +284,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libelf AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -777,7 +696,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1207,6 +1207,11 @@ +@@ -1265,6 +1265,11 @@ 2005-07-21 Roland McGrath @@ -799,7 +718,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -209,6 +210,7 @@ SHELL = @SHELL@ +@@ -210,6 +211,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -807,7 +726,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -272,7 +274,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -273,7 +275,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libdw AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -840,7 +759,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -171,6 +172,7 @@ SHELL = @SHELL@ +@@ -172,6 +173,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -848,7 +767,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -234,7 +236,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -235,7 +237,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libasm AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -859,7 +778,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -651,6 +651,11 @@ +@@ -657,6 +657,11 @@ * elf.h: Update from glibc. @@ -901,7 +820,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -217,6 +218,7 @@ SHELL = @SHELL@ +@@ -218,6 +219,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = 1 @@ -909,7 +828,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -278,7 +280,7 @@ zip_LIBS = @zip_LIBS@ +@@ -279,7 +281,7 @@ zip_LIBS = @zip_LIBS@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -928,7 +847,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -103,6 +104,7 @@ SHELL = @SHELL@ +@@ -104,6 +105,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -946,7 +865,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -183,6 +184,7 @@ SHELL = @SHELL@ +@@ -184,6 +185,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -958,20 +877,20 @@ +++ elfutils/src/addr2line.c @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl bool parsed = false; - int n; + int i, j; 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') +- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 ++ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 + && string[i] == '\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') +- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) ++ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) { - /* It was symbol+offset. */ + default: + break; --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -98,8 +98,16 @@ +@@ -165,8 +165,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -988,7 +907,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper -@@ -263,6 +271,8 @@ +@@ -330,6 +338,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -997,7 +916,7 @@ 2009-01-21 Ulrich Drepper * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -446,6 +456,11 @@ +@@ -513,6 +523,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -1009,7 +928,7 @@ 2008-02-29 Roland McGrath * readelf.c (print_attributes): Add a cast. -@@ -697,6 +712,8 @@ +@@ -764,6 +779,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -1018,7 +937,7 @@ 2007-10-15 Roland McGrath * make-debug-archive.in: New file. -@@ -1136,6 +1153,10 @@ +@@ -1203,6 +1220,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger . @@ -1029,7 +948,7 @@ 2006-08-08 Ulrich Drepper * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1212,6 +1233,10 @@ +@@ -1279,6 +1300,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -1040,7 +959,7 @@ 2006-06-12 Ulrich Drepper * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1560,6 +1585,11 @@ +@@ -1627,6 +1652,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -1106,7 +1025,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -256,6 +257,7 @@ SHELL = @SHELL@ +@@ -257,6 +258,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1114,7 +1033,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -320,7 +322,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi +@@ -321,7 +323,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi -I$(srcdir)/../libasm AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ @@ -1123,7 +1042,7 @@ $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \ $(am__append_1) @MUDFLAP_FALSE@libmudflap = -@@ -367,6 +369,9 @@ strings_no_Wformat = yes +@@ -368,6 +370,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 @@ -1135,7 +1054,7 @@ size_LDADD = $(libelf) $(libeu) $(libmudflap) --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -7655,7 +7655,7 @@ dump_archive_index (Elf *elf, const char +@@ -7845,7 +7845,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)) @@ -1237,7 +1156,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -150,6 +150,8 @@ +@@ -154,6 +154,8 @@ 2008-01-21 Roland McGrath @@ -1246,7 +1165,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -858,6 +860,11 @@ +@@ -862,6 +864,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -1279,7 +1198,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -400,6 +401,7 @@ SHELL = @SHELL@ +@@ -401,6 +402,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -1287,7 +1206,7 @@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -@@ -461,7 +463,7 @@ zip_LIBS = @zip_LIBS@ +@@ -462,7 +464,7 @@ zip_LIBS = @zip_LIBS@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2) AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \ $($(*F)_no_Werror),,-Werror) $(if \ diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch index e1356d4..6d207a6 100644 --- a/elfutils-robustify.patch +++ b/elfutils-robustify.patch @@ -1,6 +1,6 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -643,10 +643,53 @@ +@@ -649,10 +649,53 @@ 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. @@ -865,7 +865,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1548,6 +1548,16 @@ +@@ -1615,6 +1615,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -882,7 +882,7 @@ 2005-06-08 Roland McGrath * readelf.c (print_ops): Add consts. -@@ -1593,6 +1603,19 @@ +@@ -1660,6 +1670,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -1179,7 +1179,7 @@ idx, section_name (ebl, idx), --- elfutils/src/readelf.c +++ elfutils/src/readelf.c -@@ -1171,6 +1171,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1172,6 +1172,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G Elf32_Word *grpref = (Elf32_Word *) data->d_buf; GElf_Sym sym_mem; @@ -1188,7 +1188,7 @@ printf ((grpref[0] & GRP_COMDAT) ? ngettext ("\ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1183,8 +1185,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G +@@ -1184,8 +1186,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), @@ -1199,7 +1199,7 @@ ?: gettext (""), data->d_size / sizeof (Elf32_Word) - 1); -@@ -1335,7 +1337,8 @@ static void +@@ -1336,7 +1338,8 @@ static void handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) { int class = gelf_getclass (ebl->elf); @@ -1209,7 +1209,7 @@ Elf_Data *data; size_t cnt; size_t shstrndx; -@@ -1350,6 +1353,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1351,6 +1354,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1221,7 +1221,7 @@ printf (ngettext ("\ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -1359,9 +1367,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, +@@ -1360,9 +1368,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (int) shdr->sh_link, @@ -1232,7 +1232,7 @@ fputs_unlocked (gettext (" Type Value\n"), stdout); for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -@@ -1944,6 +1950,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1945,6 +1951,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1246,7 +1246,7 @@ /* Now we can compute the number of entries in the section. */ unsigned int nsyms = data->d_size / (class == ELFCLASS32 ? sizeof (Elf32_Sym) -@@ -1954,15 +1967,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G +@@ -1955,15 +1968,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G nsyms), (unsigned int) elf_ndxscn (scn), elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); @@ -1263,7 +1263,7 @@ fputs_unlocked (class == ELFCLASS32 ? gettext ("\ -@@ -2198,7 +2208,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2199,7 +2209,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1278,7 +1278,7 @@ printf (ngettext ("\ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2209,9 +2225,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, +@@ -2210,9 +2226,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1289,7 +1289,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2264,8 +2278,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2265,8 +2279,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G error (EXIT_FAILURE, 0, gettext ("cannot get section header string table index")); @@ -1305,7 +1305,7 @@ printf (ngettext ("\ \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", "\ -@@ -2277,9 +2297,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G +@@ -2278,9 +2298,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1316,7 +1316,7 @@ unsigned int offset = 0; for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2541,8 +2559,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2542,8 +2560,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G filename = NULL; } @@ -1332,7 +1332,7 @@ printf (ngettext ("\ \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", "\ -@@ -2554,9 +2578,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G +@@ -2555,9 +2579,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1343,7 +1343,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) -@@ -2608,7 +2630,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2609,7 +2631,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) ++counts[lengths[cnt]]; @@ -1362,7 +1362,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", "\ -@@ -2621,9 +2653,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, +@@ -2622,9 +2654,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, shdr->sh_addr, shdr->sh_offset, (unsigned int) shdr->sh_link, @@ -1373,7 +1373,7 @@ if (extrastr != NULL) fputs (extrastr, stdout); -@@ -4265,6 +4295,16 @@ print_debug_aranges_section (Dwfl_Module +@@ -4312,6 +4342,16 @@ print_debug_aranges_section (Dwfl_Module return; } diff --git a/elfutils.spec b/elfutils.spec index d6bb226..8cd43bb 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,4 +1,4 @@ -%global eu_version 0.147 +%global eu_version 0.148 %global eu_release 1 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -21,6 +21,14 @@ %global separate_devel_static 1 %endif +%if %{compat} || %{!?rhel:6}%{?rhel} < 6 +%global nocheck true +%else +%global nocheck false +%endif + +%global depsuffix %{?_isa}%{!?_isa:-%{_arch}} + Summary: A collection of utilities and DSOs to handle compiled objects Name: elfutils Version: %{eu_version} @@ -35,8 +43,12 @@ URL: https://fedorahosted.org/elfutils/ Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2 Patch1: elfutils-robustify.patch Patch2: elfutils-portability.patch -Requires: elfutils-libelf-%{_arch} = %{version}-%{release} -Requires: elfutils-libs-%{_arch} = %{version}-%{release} +Requires: elfutils-libelf%{depsuffix} = %{version}-%{release} +Requires: elfutils-libs%{depsuffix} = %{version}-%{release} + +%if %{!?rhel:6}%{?rhel} < 6 || %{!?fedora:9}%{?fedora} < 10 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%endif BuildRequires: gettext BuildRequires: bison >= 1.875 @@ -89,8 +101,10 @@ symbols), readelf (to see the raw ELF file structures), and elflint %package libs Summary: Libraries to handle compiled objects Group: Development/Tools -Provides: elfutils-libs-%{_arch} = %{version}-%{release} -Requires: elfutils-libelf-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-libs%{depsuffix} = %{version}-%{release} +%endif +Requires: elfutils-libelf%{depsuffix} = %{version}-%{release} %description libs The elfutils-libs package contains libraries which implement DWARF, ELF, @@ -101,11 +115,13 @@ other programs using these libraries. %package devel Summary: Development libraries to handle compiled objects Group: Development/Tools -Provides: elfutils-devel-%{_arch} = %{version}-%{release} -Requires: elfutils-libs-%{_arch} = %{version}-%{release} -Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-devel%{depsuffix} = %{version}-%{release} +%endif +Requires: elfutils-libs%{depsuffix} = %{version}-%{release} +Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release} %if !0%{?separate_devel_static} -Requires: elfutils-devel-static-%{_arch} = %{version}-%{release} +Requires: elfutils-devel-static%{depsuffix} = %{version}-%{release} %endif %description devel @@ -118,9 +134,11 @@ assembler interface. %package devel-static Summary: Static archives to handle compiled objects Group: Development/Tools -Provides: elfutils-devel-static-%{_arch} = %{version}-%{release} -Requires: elfutils-devel-%{_arch} = %{version}-%{release} -Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-devel-static%{depsuffix} = %{version}-%{release} +%endif +Requires: elfutils-devel%{depsuffix} = %{version}-%{release} +Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release} %description devel-static The elfutils-devel-static package contains the static archives @@ -129,7 +147,9 @@ with the code to handle compiled objects. %package libelf Summary: Library to read and write ELF files Group: Development/Tools -Provides: elfutils-libelf-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-libelf%{depsuffix} = %{version}-%{release} +%endif Obsoletes: libelf <= 0.8.2-2 %description libelf @@ -141,10 +161,12 @@ elfutils package use it also to generate new ELF files. %package libelf-devel Summary: Development support for libelf Group: Development/Tools -Provides: elfutils-libelf-devel-%{_arch} = %{version}-%{release} -Requires: elfutils-libelf-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-libelf-devel%{depsuffix} = %{version}-%{release} +%endif +Requires: elfutils-libelf%{depsuffix} = %{version}-%{release} %if !0%{?separate_devel_static} -Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} +Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release} %endif Obsoletes: libelf-devel <= 0.8.2-2 @@ -157,8 +179,10 @@ different sections of an ELF file. %package libelf-devel-static Summary: Static archive of libelf Group: Development/Tools -Provides: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} -Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} +%if 0%{!?_isa} +Provides: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release} +%endif +Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release} %description libelf-devel-static The elfutils-libelf-static package contains the static archive @@ -216,7 +240,7 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so* %find_lang %{name} %check -make -s check +make -s check || %{nocheck} %clean rm -rf ${RPM_BUILD_ROOT} @@ -293,6 +317,17 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libelf.a %changelog +* Mon Jun 28 2010 Roland McGrath - 0.148-1 +- Update to 0.148 + - libdw: Accept DWARF 4 format: new functions dwarf_next_unit, + dwarf_offdie_types. + New functions dwarf_lineisa, dwarf_linediscriminator, + dwarf_lineop_index. + - libdwfl: Fixes in core-file handling, support cores from PIEs. (#588818) + When working from build IDs, don't open a named file + that mismatches. + - readelf: Handle DWARF 4 formats. + * Mon May 3 2010 Roland McGrath - 0.147-1 - Update to 0.147 diff --git a/sources b/sources index cb86e2f..6906f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ccb6bba1d96c096f1b5dbd34444554a3 elfutils-0.147.tar.bz2 +a0bed1130135f17ad27533b0034dba8d elfutils-0.148.tar.bz2 From 27bbdd4293ed1e1047a71bcb029d7d83de2b5e4c Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 29 Jun 2010 04:41:53 +0000 Subject: [PATCH 09/10] old .sig --- elfutils-0.144.tar.bz2.sig | Bin 72 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 elfutils-0.144.tar.bz2.sig diff --git a/elfutils-0.144.tar.bz2.sig b/elfutils-0.144.tar.bz2.sig deleted file mode 100644 index 28c95ef30fcc5a686f0f003dd13adaf89e2e9636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!vTYl>iC}5ZWlhI(h#@bn^fJo4z`yWUE From f290f6b4a8b7bdb6c169412f18e8c22a74e008dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:41:00 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 63 ---------------------------------------- branch | 1 - 3 files changed, 64 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f318ff5..0000000 --- a/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Makefile for source rpm: elfutils -# $Id$ -NAME := elfutils -SPECFILE = elfutils.spec - -all: - -UPSTREAM_CHECKS := sig -UPSTREAM_FILES = $(NAME)-$(VERSION).tar.bz2 -upstream:; - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - -ifneq (,$(CURL)) -CURL += -k -endif - -patches := $(patsubst %,elfutils-%.patch,robustify portability) -all: $(patches) - -branch-portability = portable - -git-%/configure: .git/refs/heads/* Makefile - @rm -rf $(@D) - git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf - - cd $(@D) && autoreconf -i && rm -rf autom4te.cache - -elfutils-%.patch: git-%/configure - branch=$(firstword $(branch-$*) $*); \ - master=`git merge-base origin/master $$branch` && \ - master=`git describe --tags --always $$master` && \ - (set -x; $(MAKE) git-$$master/configure) && \ - (set -x; diff --exclude='.gitignore' -Nrpu git-$$master $( $@.new - mv $@.new $@ - -elfutils-portable.spec: elfutils.spec - (echo '%define _with_compat 1'; sed 's/ check$$/& || :/' $<) > $@.new - mv -f $@.new $@ - -portable-r = 0.$(subst $(DIST),,$(RELEASE)) -portable-vr = $(VERSION)-$(portable-r) -portable.srpm = elfutils-$(portable-vr).src.rpm -$(portable.srpm): elfutils-portable.spec $(patches) \ - elfutils-$(VERSION).tar.bz2 - $(RPM_WITH_DIRS) --nodeps -bs $< - -portable-srpm: $(portable.srpm) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12