[binutils] Fix typos in invocations of memset in elf32-xtensa.c

[Nicholas Clifton]

commit 8627b7fec0c311619a447c6f744cf85be366db87
Author: Nick Clifton <nickc at redhat.com>
Date:   Mon Aug 12 11:56:59 2013 +0100

     Fix typos in invocations of memset in elf32-xtensa.c

 binutils-2.23.2-xtensa.memset.patch |   36 +++++++++++++++++++++++++++++++++++
 binutils.spec                       |   10 +++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/binutils-2.23.2-xtensa.memset.patch b/binutils-2.23.2-xtensa.memset.patch
new file mode 100644
index 0000000..cbda3af
--- /dev/null
+++ b/binutils-2.23.2-xtensa.memset.patch
@@ -0,0 +1,36 @@
+*** ../binutils-2.23.2.orig/bfd/elf32-xtensa.c	2013-08-12 11:34:01.224216581 +0100
+--- bfd/elf32-xtensa.c	2013-08-12 11:34:57.932218153 +0100
+*************** clear_section_cache (section_cache_t *se
+*** 6075,6081 ****
+        release_internal_relocs (sec_cache->sec, sec_cache->relocs);
+        if (sec_cache->ptbl)
+  	free (sec_cache->ptbl);
+!       memset (sec_cache, 0, sizeof (sec_cache));
+      }
+  }
+  
+--- 6075,6081 ----
+        release_internal_relocs (sec_cache->sec, sec_cache->relocs);
+        if (sec_cache->ptbl)
+  	free (sec_cache->ptbl);
+!       memset (sec_cache, 0, sizeof (* sec_cache));
+      }
+  }
+  
+*************** section_cache_section (section_cache_t *
+*** 6117,6123 ****
+  
+    /* Fill in the new section cache.  */
+    clear_section_cache (sec_cache);
+!   memset (sec_cache, 0, sizeof (sec_cache));
+  
+    sec_cache->sec = sec;
+    sec_cache->contents = contents;
+--- 6117,6123 ----
+  
+    /* Fill in the new section cache.  */
+    clear_section_cache (sec_cache);
+!   memset (sec_cache, 0, sizeof (* sec_cache));
+  
+    sec_cache->sec = sec;
+    sec_cache->contents = contents;
diff --git a/binutils.spec b/binutils.spec
index 63024cc..e9f3276 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -27,7 +27,7 @@ Name: %{?cross}binutils%{?_with_debug:-debug}
 # official binutils release happens (2.24.0) we will be able to restore
 # Version to an honest value and everything will be good again.
 Version: 2.23.88.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -71,7 +71,9 @@ Patch18: binutils-2.23.2-dwz-alt-debuginfo.patch
 # Correct bug introduced by patch 16
 Patch19: binutils-2.23.2-aarch64-em.patch
 # Add support for the .machinemode pseudo-op to the S/390 assembler.
-patch20: binutils-2.23.2-s390-gas-machinemode.patch
+Patch20: binutils-2.23.2-s390-gas-machinemode.patch
+# Fix a snafu in the xtensa BFD sources
+Patch21: binutils-2.23.2-xtensa.memset.patch
 
 Provides: bundled(libiberty)
 
@@ -197,6 +199,7 @@ using libelf instead of BFD.
 %patch18 -p0 -b .dwz~
 %patch19 -p0 -b .aarch64~
 %patch20 -p0 -b .machinemode~
+%patch21 -p0 -b .xtensa~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -502,6 +505,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Mon Aug 12 2013 Nick Clifton <nickc at redhat.com> 2.23.88.0.1-11
+- Fix typos in invocations of memset in elf32-xtensa.c
+
 * Wed Aug 07 2013 Karsten Hopp <karsten at redhat.com> 2.23.88.0.1-10
 - disable -Werror on ppc64p7 for #918189