From ce7c039e50d0796d26107aaf36682fd491985239 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 05 2017 07:18:22 +0000
Subject: import binutils-2.25.1-32.base.el7_4.1


---

diff --git a/SOURCES/binutils-2.25.1-remove-dwarf2-minmax.patch b/SOURCES/binutils-2.25.1-remove-dwarf2-minmax.patch
new file mode 100644
index 0000000..8856fcb
--- /dev/null
+++ b/SOURCES/binutils-2.25.1-remove-dwarf2-minmax.patch
@@ -0,0 +1,42 @@
+diff -rup binutils.orig/bfd/dwarf2.c binutils-2.25.1/bfd/dwarf2.c
+--- binutils.orig/bfd/dwarf2.c	2017-06-29 16:40:13.563084821 +0100
++++ binutils-2.25.1/bfd/dwarf2.c	2017-06-30 08:15:33.634862399 +0100
+@@ -215,9 +215,6 @@ struct comp_unit
+   /* Linked list of the low and high address ranges contained in this
+      compilation unit as specified in the compilation unit header.  */
+   struct arange arange;
+-  /* A single arange containing the lowest and highest
+-     addresses covered by the compilation unit.  */
+-  struct arange minmax;
+ 
+   /* The DW_AT_name attribute (for error messages).  */
+   char *name;
+@@ -1540,16 +1537,11 @@ arange_add (struct comp_unit *unit, stru
+   /* If the first arange is empty, use it.  */
+   if (first_arange->high == 0)
+     {
+-      unit->minmax.low = first_arange->low = low_pc;
+-      unit->minmax.high = first_arange->high = high_pc;
++      first_arange->low = low_pc;
++      first_arange->high = high_pc;
+       return TRUE;
+     }
+ 
+-  if (unit->minmax.low > low_pc)
+-    unit->minmax.low = low_pc;
+-  if (unit->minmax.high < high_pc)
+-    unit->minmax.high = high_pc;
+-  
+   /* Next see if we can cheaply extend an existing range.  */
+   arange = first_arange;
+   do
+@@ -3143,9 +3135,6 @@ comp_unit_contains_address (struct comp_
+   if (unit->error)
+     return FALSE;
+ 
+-  if (unit->minmax.high < addr || unit->minmax.low > addr)
+-    return FALSE;
+-
+   /* We know that the address *might* be contained within this comp
+      unit, but we cannot be sure until we check the specific ranges.  */
+   arange = &unit->arange;
diff --git a/SPECS/binutils.spec b/SPECS/binutils.spec
index 33134f4..fb90790 100644
--- a/SPECS/binutils.spec
+++ b/SPECS/binutils.spec
@@ -22,7 +22,7 @@ Version: 2.25.1
 # Note: The Release string *must* be different from that used by any of the 
 # devtoolset binutils associated with this release.  That is why ".base"
 # has been appended here.  See BZ 1337617 for more details.
-Release: 31.base%{?dist}
+Release: 32.base%{?dist}.1
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -82,6 +82,8 @@ Patch29: binutils-2.25.1-objdump-speedup.patch
 Patch30: binutils-2.25.1-ppc-stub-counting.patch
 # Fix s390 PLT entry allocation.
 Patch31: binutils-2.25.1-s390-plt.patch
+# Revert parts of patch29 that were preventing proper function name lookup.
+Patch32: binutils-2.25.1-remove-dwarf2-minmax.patch
 
 # A *temporary* patch to disable checking for valid PowerPC64 TLBIE
 # instructions.  This allows the PPC kernel to be built.  See:
@@ -239,8 +241,9 @@ touch */configure
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 
-# TEMPORARY patch.
+# TEMPORARY patch - do not propogate to RHEL 8.
 %patch999 -p1
 
 
@@ -520,6 +523,14 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Wed Aug 09 2017 Nick Clifton <nickc@redhat.com> 2.25.1-32.base.1
+- Revert part of the objdump speed up patch which was preventing proper function name lookup.
+  (#1479773)
+
+* Fri Jun 30 2017 Nick Clifton <nickc@redhat.com> 2.25.1-32.base
+- Revert part of the objdump speed up patch which was preventing proper function name lookup.
+  (#1465318)
+
 * Tue May 09 2017 Nick Clifton <nickc@redhat.com> 2.25.1-31.base
 - Fix generation of PLT entries for s390 binaries.
   (#1440168)