From 1ac3c72670171960fa3e133beb052809ddbc37c6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Jul 19 2011 11:22:08 +0000 Subject: Rebase on 2.21.53.0.1 tarball. Delete unneeded patches. (BZ 712668) --- diff --git a/.gitignore b/.gitignore index 0d33226..186cf9b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ binutils-2.20.51.0.10.tar.bz2 /binutils-2.21.51.0.8.tar.bz2 /binutils-2.21.51.0.9.tar.bz2 /binutils-2.21.52.0.1.tar.bz2 +/binutils-2.21.53.0.1.tar.bz2 diff --git a/binutils-2.21.52.0.1-finding-without-symbols.patch b/binutils-2.21.52.0.1-finding-without-symbols.patch deleted file mode 100644 index f1775b3..0000000 --- a/binutils-2.21.52.0.1-finding-without-symbols.patch +++ /dev/null @@ -1,14 +0,0 @@ -*** ../binutils-2.21.52.0.1.orig/bfd/elf.c 2011-06-16 13:11:38.286862001 +0100 ---- bfd/elf.c 2011-06-16 13:13:45.990862002 +0100 -*************** elf_find_function (bfd *abfd, -*** 7508,7513 **** ---- 7508,7516 ---- - enum { nothing_seen, symbol_seen, file_after_symbol_seen } state; - const struct elf_backend_data *bed = get_elf_backend_data (abfd); - -+ if (symbols == NULL) -+ return FALSE; -+ - filename = NULL; - func = NULL; - file = NULL; diff --git a/binutils-2.21.52.0.1-keeping-notes.patch b/binutils-2.21.52.0.1-keeping-notes.patch deleted file mode 100644 index 656cca3..0000000 --- a/binutils-2.21.52.0.1-keeping-notes.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -cp ../binutils-2.21.52.0.1.orig/bfd/ChangeLog bfd/ChangeLog -*** ../binutils-2.21.52.0.1.orig/bfd/ChangeLog 2011-06-10 08:31:15.181479004 +0100 ---- bfd/ChangeLog 2011-06-10 08:37:07.663479004 +0100 -*************** -*** 1,3 **** ---- 1,9 ---- -+ 2011-06-08 H.J. Lu -+ -+ PR ld/12851 -+ * elflink.c (elf_gc_sweep): Don't check SHT_NOTE sections here. -+ (bfd_elf_gc_sections): Also check SHT_NOTE sections. -+ - 2011-06-08 Alan Modra - - * aix386-core.c, * cisco-core.c, * hpux-core.c, * osf-core.c, -Common subdirectories: ../binutils-2.21.52.0.1.orig/bfd/doc and bfd/doc -diff -cp ../binutils-2.21.52.0.1.orig/bfd/elflink.c bfd/elflink.c -*** ../binutils-2.21.52.0.1.orig/bfd/elflink.c 2011-06-10 08:31:12.961479004 +0100 ---- bfd/elflink.c 2011-06-10 08:36:10.796479004 +0100 -*************** elf_gc_sweep (bfd *abfd, struct bfd_link -*** 11818,11827 **** - o->gc_mark = first->gc_mark; - } - else if ((o->flags & (SEC_DEBUGGING | SEC_LINKER_CREATED)) != 0 -! || (o->flags & (SEC_ALLOC | SEC_LOAD | SEC_RELOC)) == 0 -! || elf_section_data (o)->this_hdr.sh_type == SHT_NOTE) - { -! /* Keep debug, special and SHT_NOTE sections. */ - o->gc_mark = 1; - } - ---- 11818,11826 ---- - o->gc_mark = first->gc_mark; - } - else if ((o->flags & (SEC_DEBUGGING | SEC_LINKER_CREATED)) != 0 -! || (o->flags & (SEC_ALLOC | SEC_LOAD | SEC_RELOC)) == 0) - { -! /* Keep debug and special sections. */ - o->gc_mark = 1; - } - -*************** bfd_elf_gc_sections (bfd *abfd, struct b -*** 12103,12110 **** - if (bfd_get_flavour (sub) != bfd_target_elf_flavour) - continue; - - for (o = sub->sections; o != NULL; o = o->next) -! if ((o->flags & (SEC_EXCLUDE | SEC_KEEP)) == SEC_KEEP && !o->gc_mark) - if (!_bfd_elf_gc_mark (info, o, gc_mark_hook)) - return FALSE; - } ---- 12102,12113 ---- - if (bfd_get_flavour (sub) != bfd_target_elf_flavour) - continue; - -+ /* Also keep SHT_NOTE sections. */ - for (o = sub->sections; o != NULL; o = o->next) -! if ((o->flags & SEC_EXCLUDE) == 0 -! && ((o->flags & SEC_KEEP) != 0 -! || elf_section_data (o)->this_hdr.sh_type == SHT_NOTE) -! && !o->gc_mark) - if (!_bfd_elf_gc_mark (info, o, gc_mark_hook)) - return FALSE; - } -Common subdirectories: ../binutils-2.21.52.0.1.orig/bfd/hosts and bfd/hosts -Common subdirectories: ../binutils-2.21.52.0.1.orig/bfd/.libs and bfd/.libs -Common subdirectories: ../binutils-2.21.52.0.1.orig/bfd/po and bfd/po diff --git a/binutils-2.21.52.0.1-sh_offset-for-SHT_NOBITS.patch b/binutils-2.21.52.0.1-sh_offset-for-SHT_NOBITS.patch deleted file mode 100644 index 100828b..0000000 --- a/binutils-2.21.52.0.1-sh_offset-for-SHT_NOBITS.patch +++ /dev/null @@ -1,55 +0,0 @@ -*** ../binutils-2.21.52.0.1.orig/bfd/elf.c 2011-06-24 11:21:17.380536999 +0100 ---- bfd/elf.c 2011-06-24 11:27:44.781536999 +0100 -*************** assign_file_positions_for_load_sections -*** 4803,4826 **** - } - else - { -! if (p->p_type == PT_LOAD -! || (this_hdr->sh_type == SHT_NOBITS -! && (this_hdr->sh_flags & SHF_TLS) != 0 -! && this_hdr->sh_offset == 0)) - { -! if (this_hdr->sh_type == SHT_NOBITS) -! { -! /* These sections don't really need sh_offset, -! but give them one anyway. */ -! bfd_vma adjust = vma_page_aligned_bias (this_hdr->sh_addr, -! off, align); -! this_hdr->sh_offset = sec->filepos = off + adjust; -! } -! else -! { -! this_hdr->sh_offset = sec->filepos = off; -! off += this_hdr->sh_size; -! } - } - - if (this_hdr->sh_type != SHT_NOBITS) ---- 4803,4828 ---- - } - else - { -! if (p->p_type == PT_LOAD) - { -! this_hdr->sh_offset = sec->filepos = off; -! if (this_hdr->sh_type != SHT_NOBITS) -! off += this_hdr->sh_size; -! } -! else if (this_hdr->sh_type == SHT_NOBITS -! && (this_hdr->sh_flags & SHF_TLS) != 0 -! && this_hdr->sh_offset == 0) -! { -! /* This is a .tbss section that didn't get a PT_LOAD. -! (See _bfd_elf_map_sections_to_segments "Create a -! final PT_LOAD".) Set sh_offset to the value it -! would have if we had created a zero p_filesz and -! p_memsz PT_LOAD header for the section. This -! also makes the PT_TLS header have the same -! p_offset value. */ -! bfd_vma adjust = vma_page_aligned_bias (this_hdr->sh_addr, -! off, align); -! this_hdr->sh_offset = sec->filepos = off + adjust; - } - - if (this_hdr->sh_type != SHT_NOBITS) diff --git a/binutils.spec b/binutils.spec index 7797a41..a9fc787 100644 --- a/binutils.spec +++ b/binutils.spec @@ -16,8 +16,8 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} -Version: 2.21.52.0.1 -Release: 5%{?dist} +Version: 2.21.53.0.1 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -31,9 +31,6 @@ Patch05: binutils-2.20.51.0.2-set-long-long.patch Patch06: binutils-2.20.51.0.10-copy-osabi.patch Patch07: binutils-2.20.51.0.10-sec-merge-emit.patch Patch08: binutils-2.20.51.0.2-build-id.patch -Patch09: binutils-2.21.52.0.1-keeping-notes.patch -Patch10: binutils-2.21.52.0.1-finding-without-symbols.patch -Patch11: binutils-2.21.52.0.1-sh_offset-for-SHT_NOBITS.patch %define gold_arches %ix86 x86_64 @@ -132,9 +129,6 @@ using libelf instead of BFD. %patch06 -p0 -b .copy-osabi~ %patch07 -p0 -b .sec-merge-emit~ %patch08 -p0 -b .build-id~ -%patch09 -p0 -b .keeping-notes~ -%patch10 -p0 -b .finding~ -%patch11 -p0 -b .sh_offset~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -424,6 +418,9 @@ exit 0 %endif # %{isnative} %changelog +* Tue Jul 19 2011 Nick Clifton - 2.21.53.0.1-1 +- Rebase on 2.21.53.0.1 tarball. Delete unneeded patches. (BZ 712668) + * Fri Jun 24 2011 Nick Clifton - 2.21.52.0.1-5 - Import fix for PR ld/12921. diff --git a/sources b/sources index 1d39f1b..b5ffbe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32cee6ed103fc428cd802bac938ea7b3 binutils-2.21.52.0.1.tar.bz2 +5b15f6dbced20172431e349b47a30758 binutils-2.21.53.0.1.tar.bz2