- up to 2.21.52.0.1

Changed files:
    binutils-pr12163.patch -> 1.2
    binutils-warn_ro_relocs.patch -> 1.2
    binutils.spec -> 1.343

diff --git a/binutils-pr12163.patch b/binutils-pr12163.patch
deleted file mode 100644 (file)
index 70c0873..0000000
--- a/binutils-pr12163.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/gold/archive.cc  
-+++ a/gold/archive.cc  
-@@ -179,7 +179,8 @@ Archive::Archive(const std::string& name, Input_file* input_file,
-   : Library_base(task), name_(name), input_file_(input_file), armap_(),
-     armap_names_(), extended_names_(), armap_checked_(), seen_offsets_(),
-     members_(), is_thin_archive_(is_thin_archive), included_member_(false),
--    nested_archives_(), dirpath_(dirpath), num_members_(0)
-+    nested_archives_(), dirpath_(dirpath), num_members_(0),
-+    included_all_members_(false)
- {
-   this->no_export_ =
-     parameters->options().check_excluded_libs(input_file->found_name());
-@@ -847,6 +848,13 @@ bool
- Archive::include_all_members(Symbol_table* symtab, Layout* layout,
-                              Input_objects* input_objects, Mapfile* mapfile)
- {
-+  // Don't include the same archive twice.  This can happen if
-+  // --whole-archive is nested inside --start-group (PR gold/12163).
-+  if (this->included_all_members_)
-+    return true;
-+
-+  this->included_all_members_ = true;
-+
-   input_objects->archive_start(this);
- 
-   if (this->members_.size() > 0)
---- a/gold/archive.h   
-+++ a/gold/archive.h   
-@@ -405,6 +405,8 @@ class Archive : public Library_base
-   unsigned int num_members_;
-   // True if we exclude this library archive from automatic export.
-   bool no_export_;
-+  // True if this library has been included as a --whole-archive.
-+  bool included_all_members_;
- };
- 
- // This class is used to read an archive and pick out the desired

diff --git a/binutils-warn_ro_relocs.patch b/binutils-warn_ro_relocs.patch
deleted file mode 100644 (file)
index 15e9da9..0000000
--- a/binutils-warn_ro_relocs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit cd83a0f5f7496853f21ae956ffcc3759adee1c1f
-Author: H.J. Lu <hjl.tools@gmail.com>
-Date:   Wed Jun 1 19:42:00 2011 +0000
-
-    Properly warn relocation in readonly section in a shared object.
-    
-    2011-06-01  H.J. Lu  <hongjiu.lu@intel.com>
-    
-       * elf32-i386.c (elf_i386_size_dynamic_sections): Properly warn
-       relocation in readonly section in a shared object.
-       * elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Likewise.
-
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index ee1511f..eea2263 100644
---- a/bfd/elf32-i386.c
-+++ b/bfd/elf32-i386.c
-@@ -2488,13 +2488,13 @@ elf_i386_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-               {
-                 srel = elf_section_data (p->sec)->sreloc;
-                 srel->size += p->count * sizeof (Elf32_External_Rel);
--                if ((p->sec->output_section->flags & SEC_READONLY) != 0)
-+                if ((p->sec->output_section->flags & SEC_READONLY) != 0
-+                    && (info->flags & DF_TEXTREL) == 0)
-                   {
-                     info->flags |= DF_TEXTREL;
-                     if (info->warn_shared_textrel && info->shared)
-                       info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'.\n"),
-                                               p->sec->owner, p->sec);
--                    break;
-                   }
-               }
-           }
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index 5cbaff8..9d6d4a4 100644
---- a/bfd/elf64-x86-64.c
-+++ b/bfd/elf64-x86-64.c
-@@ -2399,13 +2399,13 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
-               {
-                 srel = elf_section_data (p->sec)->sreloc;
-                 srel->size += p->count * bed->s->sizeof_rela;
--                if ((p->sec->output_section->flags & SEC_READONLY) != 0)
-+                if ((p->sec->output_section->flags & SEC_READONLY) != 0
-+                    && (info->flags & DF_TEXTREL) == 0)
-                   {
-                     info->flags |= DF_TEXTREL;
-                     if (info->warn_shared_textrel && info->shared)
-                       info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'.\n"),
-                                               p->sec->owner, p->sec);
--                    break;
-                   }
-               }
-           }

diff --git a/binutils.spec b/binutils.spec
index 068c23e1a5371bed22286135e61fd87d9aa2596a..8636d5967ca5628de9a988a259b83e1d1da4a868 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.21.51.0.9
-Release:       4
+Version:       2.21.52.0.1
+Release:       1
 Epoch:         3
 License:       GPL v3+
 Group:         Development/Tools
 Source0:       ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2
-# Source0-md5: 2ac3a7dae9f177f2b29f4ef1852c27a8
+# Source0-md5: 32cee6ed103fc428cd802bac938ea7b3
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch0:                %{name}-gasp.patch
@@ -34,8 +34,6 @@ Patch6:               %{name}-absolute-gnu_debuglink-path.patch
 Patch7:                %{name}-libtool-m.patch
 Patch8:                %{name}-build-id.patch
 Patch9:                %{name}-tooldir.patch
-Patch10:       %{name}-pr12163.patch
-Patch11:       %{name}-warn_ro_relocs.patch
 URL:           http://sources.redhat.com/binutils/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
@@ -156,8 +154,6 @@ niektórych pakietów.
 %patch7 -p1
 %patch8 -p0
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 # file contains hacks for ac 2.59 only
 %{__rm} config/override.m4