[oe-commits] Khem Raj : binutils_2.18.50.0.7.bb: Add fix for PR 7093

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8aa6fe99aa80a2dbdfcfd06e83fdfe767f5b211f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8aa6fe99aa80a2dbdfcfd06e83fdfe767f5b211f

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Jan  2 15:02:15 2009 -0800

binutils_2.18.50.0.7.bb: Add fix for PR 7093
binutils_2.19.bb: Ditto

---

 .../binutils-2.18.50.0.7/binutils-arm-pr7093.patch |   19 +++++++++++++++++++
 .../binutils-2.19/binutils-arm-pr7093.patch        |   19 +++++++++++++++++++
 packages/binutils/binutils_2.18.50.0.7.bb          |    3 ++-
 packages/binutils/binutils_2.19.bb                 |    3 ++-
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/packages/binutils/binutils-2.18.50.0.7/binutils-arm-pr7093.patch b/packages/binutils/binutils-2.18.50.0.7/binutils-arm-pr7093.patch
new file mode 100644
index 0000000..ad4a556
--- /dev/null
+++ b/packages/binutils/binutils-2.18.50.0.7/binutils-arm-pr7093.patch
@@ -0,0 +1,19 @@
+Index: binutils/bfd/elf32-arm.c
+===================================================================
+RCS file: /cvs/src/src/bfd/elf32-arm.c,v
+retrieving revision 1.162
+retrieving revision 1.163
+diff -u -r1.162 -r1.163
+--- binutils/bfd/elf32-arm.c	23 Dec 2008 09:01:45 -0000	1.162
++++ binutils/bfd/elf32-arm.c	23 Dec 2008 11:46:17 -0000	1.163
+@@ -4608,6 +4608,10 @@
+   Elf_Internal_Shdr *hdr;
+   unsigned int i, localsyms;
+ 
++  /* PR 7093: Make sure that we are dealing with an arm elf binary.  */
++  if (! is_arm_elf (abfd))
++    return;
++
+   if ((abfd->flags & DYNAMIC) != 0)
+     return;
+ 
diff --git a/packages/binutils/binutils-2.19/binutils-arm-pr7093.patch b/packages/binutils/binutils-2.19/binutils-arm-pr7093.patch
new file mode 100644
index 0000000..ad4a556
--- /dev/null
+++ b/packages/binutils/binutils-2.19/binutils-arm-pr7093.patch
@@ -0,0 +1,19 @@
+Index: binutils/bfd/elf32-arm.c
+===================================================================
+RCS file: /cvs/src/src/bfd/elf32-arm.c,v
+retrieving revision 1.162
+retrieving revision 1.163
+diff -u -r1.162 -r1.163
+--- binutils/bfd/elf32-arm.c	23 Dec 2008 09:01:45 -0000	1.162
++++ binutils/bfd/elf32-arm.c	23 Dec 2008 11:46:17 -0000	1.163
+@@ -4608,6 +4608,10 @@
+   Elf_Internal_Shdr *hdr;
+   unsigned int i, localsyms;
+ 
++  /* PR 7093: Make sure that we are dealing with an arm elf binary.  */
++  if (! is_arm_elf (abfd))
++    return;
++
+   if ((abfd->flags & DYNAMIC) != 0)
+     return;
+ 
diff --git a/packages/binutils/binutils_2.18.50.0.7.bb b/packages/binutils/binutils_2.18.50.0.7.bb
index 98b389f..a89431e 100644
--- a/packages/binutils/binutils_2.18.50.0.7.bb
+++ b/packages/binutils/binutils_2.18.50.0.7.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require binutils.inc
 
@@ -11,6 +11,7 @@ SRC_URI = "\
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
+     file://binutils-arm-pr7093.patch;patch=1 \
      "
 
 # powerpc patches
diff --git a/packages/binutils/binutils_2.19.bb b/packages/binutils/binutils_2.19.bb
index bd03b4d..aee5840 100644
--- a/packages/binutils/binutils_2.19.bb
+++ b/packages/binutils/binutils_2.19.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 require binutils.inc
 
@@ -11,6 +11,7 @@ SRC_URI = "\
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
+     file://binutils-arm-pr7093.patch;patch=1 \
      "
 
 # powerpc patches