From 94cc38623667ec0e044e63e6c9b9adf7ae13df0c Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Mon, 28 Nov 2011 10:20:10 -0800
Subject: binutils: upgrade from 2.21.1a to 2.22

And rebase the patches to the newer source code

This patch is upstream hence deleting it from the recipe.
	binutils/110-arm-eabi-conf.patch

(From OE-Core rev: 715bcfe3701e5ee3e12ee4af9c868a9bbf441525)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../binutils-uclibc-300-012_check_ldrunpath_length.patch     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch')

diff --git a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
index 3944f2e0b8..d31f80cd3d 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch
@@ -25,11 +25,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]
 
 @DPATCH@
-Index: src/ld/emultempl/elf32.em
+Index: binutils-2.22/ld/emultempl/elf32.em
 ===================================================================
---- src.orig/ld/emultempl/elf32.em	2009-09-23 06:54:28.000000000 -0700
-+++ src/ld/emultempl/elf32.em	2009-10-06 10:58:16.883414592 -0700
-@@ -1237,6 +1237,8 @@ fragment <<EOF
+--- binutils-2.22.orig/ld/emultempl/elf32.em
++++ binutils-2.22/ld/emultempl/elf32.em
+@@ -1273,6 +1273,8 @@ fragment <<EOF
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -38,7 +38,7 @@ Index: src/ld/emultempl/elf32.em
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation (
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -46,4 +46,4 @@ Index: src/ld/emultempl/elf32.em
 +    rpath = NULL;
  
    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     {
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
-- 
cgit v1.2.3-54-g00ecf