Copy the OSABI field in ELF headers, if set. (BZ 568921)

binutils-2.20.51.0.2-copy-osabi.patch

@@ -0,0 +1,18 @@
+*** ../binutils-2.20.51.0.2.copy-patched/bfd/elf.c	2010-03-02 14:37:43.000000000 +0000
+--- bfd/elf.c	2010-03-02 14:39:27.000000000 +0000
+*************** _bfd_elf_copy_private_bfd_data (bfd *ibf
+*** 1069,1074 ****
+--- 1069,1081 ----
+    /* Copy object attributes.  */
+    _bfd_elf_copy_obj_attributes (ibfd, obfd);
+  
++   /* If the input BFD has the OSABI field set and the
++      output BFD does not, then copy the value.  */
++   if (elf_elfheader (ibfd)->e_ident [EI_OSABI] != ELFOSABI_NONE
++       && elf_elfheader (obfd)->e_ident [EI_OSABI] == ELFOSABI_NONE)
++     elf_elfheader (obfd)->e_ident [EI_OSABI] =
++       elf_elfheader (ibfd)->e_ident [EI_OSABI];
++ 
+    return TRUE;
+  }
+  

binutils.spec

@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -37,6 +37,7 @@ Patch11: binutils-2.20.51.0.2-enable-gold.patch
 Patch12: binutils-2.20.51.0.2-gas-expr.patch
 Patch13: binutils-2.20.51.0.2-ppc-hidden-plt-relocs.patch
 Patch14: binutils-2.20.51.0.2-x86-hash-table.patch
+Patch15: binutils-2.20.51.0.2-copy-osabi.patch
 
 %define gold_arches %ix86 x86_64
 
@@ -143,6 +144,7 @@ libelf instead of BFD.
 %patch12 -p0 -b .gas-expr~
 %patch13 -p0 -b .hidden-plt~
 %patch14 -p0 -b .hash-table~
+%patch15 -p0 -b .copy-osabi~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -445,6 +447,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Tue Mar   2 2010 Nick Clifton <nickc@redhat.com> - 2.20.51.0.2-16
+- Copy the OSABI field in ELF headers, if set.  (BZ 568921)
+
 * Fri Feb  12 2010 Nick Clifton <nickc@redhat.com> - 2.20.51.0.2-15
 - Create separate static and devel sub-packages.  (BZ 556040)