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>
2026-04-19 15:32:13 +02:00 · 2011-11-28 10:20:10 -08:00
parent c62bb97c72
commit 94cc386236
19 changed files with 543 additions and 578 deletions
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"

 GCCVERSION ?= "4.6%"
 SDKGCCVERSION ?= "4.6%"
-BINUVERSION ?= "2.21.1a"
+BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.32"
 LINUXLIBCVERSION ?= "3.1"
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-canadian.inc
-PR = "r2"
+PR = "r0"
--- a/meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb
@@ -4,7 +4,7 @@ inherit crosssdk

 PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"

-PR = "r1"
+PR = "r0"

 do_configure_prepend () {
 	sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
--- a/meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
@@ -1,24 +0,0 @@
-Upstream-Status: Pending
-
--- /tmp/configure.ac	2008-06-22 14:14:59.000000000 +0200
-+++ binutils-2.18.50.0.7/configure.ac	2008-06-22 14:15:30.000000000 +0200
-@@ -561,7 +561,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
-  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
--- /tmp/configure	2008-06-22 14:17:11.000000000 +0200
-+++ binutils-2.18.50.0.7/configure	2008-06-22 14:17:56.000000000 +0200
-@@ -2307,7 +2307,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
-  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
--- a/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch
@@ -6,13 +6,13 @@ Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>

 Always try to prepend the sysroot prefix to absolute filenames first.

-Index: binutils-2.21/ld/ldfile.c
+Index: binutils-2.22/ld/ldfile.c
 ===================================================================
--- binutils-2.21.orig/ld/ldfile.c
-+++ binutils-2.21/ld/ldfile.c
-@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc
+--- binutils-2.22.orig/ld/ldfile.c
+++ binutils-2.22/ld/ldfile.c
+@@ -351,18 +351,24 @@ ldfile_open_file_search (const char *arc
      directory first.  */
-   if (! entry->is_archive)
+   if (! entry->maybe_archive)
     {
 -      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
 +      /* For absolute pathnames, try to always open the file in the
--- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch
@@ -52,9 +52,10 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>

-diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in
--- binutils-2.21.orig//ld/config.in	2010-11-05 03:34:27.000000000 -0700
-+++ binutils-2.21/ld/config.in	2011-01-19 10:48:15.147301022 -0800
+Index: binutils-2.22/ld/config.in
+===================================================================
+--- binutils-2.22.orig/ld/config.in
+++ binutils-2.22/ld/config.in
@@ -4,6 +4,9 @@
    language is requested. */
 #undef ENABLE_NLS
@@ -65,10 +66,11 @@ diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in
 /* Additional extension a shared object might have. */
 #undef EXTRA_SHLIB_EXTENSION
 
-diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure
--- binutils-2.21.orig//ld/configure	2011-01-19 10:46:46.997571921 -0800
-+++ binutils-2.21/ld/configure	2011-01-19 11:03:50.577832729 -0800
-@@ -768,6 +768,7 @@
+Index: binutils-2.22/ld/configure
+===================================================================
+--- binutils-2.22.orig/ld/configure
+++ binutils-2.22/ld/configure
+@@ -776,6 +776,7 @@ with_lib_path
 enable_targets
 enable_64_bit_bfd
 with_sysroot
@@ -76,7 +78,7 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure
 enable_gold
 enable_got
 enable_werror
-@@ -1418,6 +1419,8 @@
+@@ -1431,6 +1432,8 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --enable-targets        alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -85,7 +87,7 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure
   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
   --enable-got=<type>     GOT handling scheme (target, single, negative,
                           multigot)
-@@ -4203,7 +4206,18 @@
+@@ -4342,7 +4345,18 @@ else
 fi
 
 
@@ -104,10 +106,11 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure
 
 # Check whether --enable-got was given.
 if test "${enable_got+set}" = set; then :
-diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in
--- binutils-2.21.orig//ld/configure.in	2010-11-23 05:50:32.000000000 -0800
-+++ binutils-2.21/ld/configure.in	2011-01-19 10:50:57.378398946 -0800
-@@ -69,6 +69,16 @@
+Index: binutils-2.22/ld/configure.in
+===================================================================
+--- binutils-2.22.orig/ld/configure.in
+++ binutils-2.22/ld/configure.in
+@@ -70,6 +70,16 @@ AC_SUBST(use_sysroot)
 AC_SUBST(TARGET_SYSTEM_ROOT)
 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
 
@@ -124,10 +127,11 @@ diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in
 dnl Use --enable-gold to decide if this linker should be the default.
 dnl "install_as_default" is set to false if gold is the default linker.
 dnl "installed_linker" is the installed BFD linker name.
-diff -urN binutils-2.21.orig//ld/ldfile.c binutils-2.21/ld/ldfile.c
--- binutils-2.21.orig//ld/ldfile.c	2011-01-19 10:46:47.157553281 -0800
-+++ binutils-2.21/ld/ldfile.c	2011-01-19 10:58:30.035468447 -0800
-@@ -124,6 +124,23 @@
+Index: binutils-2.22/ld/ldfile.c
+===================================================================
+--- binutils-2.22.orig/ld/ldfile.c
+++ binutils-2.22/ld/ldfile.c
+@@ -125,6 +125,23 @@ ldfile_add_library_path (const char *nam
     {
       new_dirs->name = xstrdup (name);
       new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE);
@@ -151,12 +155,13 @@ diff -urN binutils-2.21.orig//ld/ldfile.c binutils-2.21/ld/ldfile.c
     }
 }
 
-diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h
--- binutils-2.21.orig//ld/ld.h	2009-11-26 05:45:25.000000000 -0800
-+++ binutils-2.21/ld/ld.h	2011-01-19 10:52:54.814716478 -0800
-@@ -198,6 +198,14 @@
-      input files.  */
-   bfd_boolean accept_unknown_input_arch;
+Index: binutils-2.22/ld/ld.h
+===================================================================
+--- binutils-2.22.orig/ld/ld.h
+++ binutils-2.22/ld/ld.h
+@@ -203,6 +203,14 @@ typedef struct {
+   /* If TRUE we'll just print the default output on stdout.  */
+   bfd_boolean print_output_format;
 
 +  /* If TRUE (the default) warn for uses of system directories when
 +     cross linking.  */
@@ -169,10 +174,11 @@ diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h
   /* Big or little endian as set on command line.  */
   enum endian_enum endian;
 
-diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c
--- binutils-2.21.orig//ld/ldmain.c	2010-11-05 00:20:07.000000000 -0700
-+++ binutils-2.21/ld/ldmain.c	2011-01-19 10:59:18.579767697 -0800
-@@ -259,6 +259,8 @@
+Index: binutils-2.22/ld/ldmain.c
+===================================================================
+--- binutils-2.22.orig/ld/ldmain.c
+++ binutils-2.22/ld/ldmain.c
+@@ -259,6 +259,8 @@ main (int argc, char **argv)
   command_line.warn_search_mismatch = TRUE;
   command_line.check_section_addresses = -1;
   command_line.disable_target_specific_optimizations = -1;
@@ -181,10 +187,11 @@ diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c
 
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff -urN binutils-2.21.orig//ld/ld.texinfo binutils-2.21/ld/ld.texinfo
--- binutils-2.21.orig//ld/ld.texinfo	2010-10-28 04:40:26.000000000 -0700
-+++ binutils-2.21/ld/ld.texinfo	2011-01-19 10:56:04.452567113 -0800
-@@ -2133,6 +2133,18 @@
+Index: binutils-2.22/ld/ld.texinfo
+===================================================================
+--- binutils-2.22.orig/ld/ld.texinfo
+++ binutils-2.22/ld/ld.texinfo
+@@ -2147,6 +2147,18 @@ string identifying the original linked f
 
 Passing @code{none} for @var{style} disables the setting from any
 @code{--build-id} options earlier on the command line.
@@ -203,19 +210,20 @@ diff -urN binutils-2.21.orig//ld/ld.texinfo binutils-2.21/ld/ld.texinfo
 @end table
 
 @c man end
-diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c
--- binutils-2.21.orig//ld/lexsup.c	2010-10-27 23:45:33.000000000 -0700
-+++ binutils-2.21/ld/lexsup.c	2011-01-19 11:02:07.799898432 -0800
-@@ -175,6 +175,8 @@
-   OPTION_PLUGIN_OPT,
+Index: binutils-2.22/ld/lexsup.c
+===================================================================
+--- binutils-2.22.orig/ld/lexsup.c
+++ binutils-2.22/ld/lexsup.c
+@@ -176,6 +176,8 @@ enum option_values
 #endif /* ENABLE_PLUGINS */
   OPTION_DEFAULT_SCRIPT,
+   OPTION_PRINT_OUTPUT_FORMAT,
 +  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
 +  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES
 };
 
 /* The long options.  This structure is used for both the option
-@@ -603,6 +605,14 @@
+@@ -612,6 +614,14 @@ static const struct ld_option ld_options
     TWO_DASHES },
   { {"wrap", required_argument, NULL, OPTION_WRAP},
     '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES },
@@ -230,7 +238,7 @@ diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c
 };
 
 #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -1518,6 +1528,14 @@
+@@ -1541,6 +1551,14 @@ parse_args (unsigned argc, char **argv)
               einfo (_("%P%X: --hash-size needs a numeric argument\n"));
           }
           break;
--- a/meta/recipes-devtools/binutils/binutils/binutils-powerpc-e5500.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-powerpc-e5500.patch
@@ -5,11 +5,11 @@ Add support for FSL PowerPC e5500 core.
 Signed-off-by: Edmar Wienskoski <edmar@freescale.com>
 Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

-Index: binutils-2.21.1/bfd/archures.c
+Index: binutils-2.22/bfd/archures.c
 ===================================================================
--- binutils-2.21.1.orig/bfd/archures.c
-+++ binutils-2.21.1/bfd/archures.c
-@@ -231,6 +231,7 @@ DESCRIPTION
+--- binutils-2.22.orig/bfd/archures.c
+++ binutils-2.22/bfd/archures.c
+@@ -239,6 +239,7 @@ DESCRIPTION
 .#define bfd_mach_ppc_e500      500
 .#define bfd_mach_ppc_e500mc    5001
 .#define bfd_mach_ppc_e500mc64  5005
@@ -17,11 +17,11 @@ Index: binutils-2.21.1/bfd/archures.c
 .#define bfd_mach_ppc_titan     83
 .  bfd_arch_rs6000,    {* IBM RS/6000 *}
 .#define bfd_mach_rs6k		6000
-Index: binutils-2.21.1/bfd/bfd-in2.h
+Index: binutils-2.22/bfd/bfd-in2.h
 ===================================================================
--- binutils-2.21.1.orig/bfd/bfd-in2.h
-+++ binutils-2.21.1/bfd/bfd-in2.h
-@@ -1918,6 +1918,7 @@ enum bfd_architecture
+--- binutils-2.22.orig/bfd/bfd-in2.h
+++ binutils-2.22/bfd/bfd-in2.h
+@@ -1946,6 +1946,7 @@ enum bfd_architecture
 #define bfd_mach_ppc_e500      500
 #define bfd_mach_ppc_e500mc    5001
 #define bfd_mach_ppc_e500mc64  5005
@@ -29,10 +29,10 @@ Index: binutils-2.21.1/bfd/bfd-in2.h
 #define bfd_mach_ppc_titan     83
   bfd_arch_rs6000,    /* IBM RS/6000 */
 #define bfd_mach_rs6k          6000
-Index: binutils-2.21.1/bfd/cpu-powerpc.c
+Index: binutils-2.22/bfd/cpu-powerpc.c
 ===================================================================
--- binutils-2.21.1.orig/bfd/cpu-powerpc.c
-+++ binutils-2.21.1/bfd/cpu-powerpc.c
+--- binutils-2.22.orig/bfd/cpu-powerpc.c
+++ binutils-2.22/bfd/cpu-powerpc.c
@@ -352,6 +352,20 @@ const bfd_arch_info_type bfd_powerpc_arc
     FALSE, /* not the default */
     powerpc_compatible,
@@ -54,11 +54,11 @@ Index: binutils-2.21.1/bfd/cpu-powerpc.c
     0
   }
 };
-Index: binutils-2.21.1/gas/config/tc-ppc.c
+Index: binutils-2.22/gas/config/tc-ppc.c
 ===================================================================
--- binutils-2.21.1.orig/gas/config/tc-ppc.c
-+++ binutils-2.21.1/gas/config/tc-ppc.c
-@@ -1236,6 +1236,7 @@ PowerPC options:\n\
+--- binutils-2.22.orig/gas/config/tc-ppc.c
+++ binutils-2.22/gas/config/tc-ppc.c
+@@ -1265,6 +1265,7 @@ PowerPC options:\n\
 -me500, -me500x2        generate code for Motorola e500 core complex\n\
 -me500mc,               generate code for Freescale e500mc core complex\n\
 -me500mc64,             generate code for Freescale e500mc64 core complex\n\
@@ -66,11 +66,11 @@ Index: binutils-2.21.1/gas/config/tc-ppc.c
 -mspe                   generate code for Motorola SPE instructions\n\
 -mtitan                 generate code for AppliedMicro Titan core complex\n\
 -mregnames              Allow symbolic names for registers\n\
-Index: binutils-2.21.1/gas/doc/as.texinfo
+Index: binutils-2.22/gas/doc/as.texinfo
 ===================================================================
--- binutils-2.21.1.orig/gas/doc/as.texinfo
-+++ binutils-2.21.1/gas/doc/as.texinfo
-@@ -432,7 +432,7 @@ gcc(1), ld(1), and the Info entries for 
+--- binutils-2.22.orig/gas/doc/as.texinfo
+++ binutils-2.22/gas/doc/as.texinfo
+@@ -434,7 +434,7 @@ gcc(1), ld(1), and the Info entries for 
    [@b{-a32}|@b{-a64}]
    [@b{-mpwrx}|@b{-mpwr2}|@b{-mpwr}|@b{-m601}|@b{-mppc}|@b{-mppc32}|@b{-m603}|@b{-m604}|@b{-m403}|@b{-m405}|
     @b{-m440}|@b{-m464}|@b{-m476}|@b{-m7400}|@b{-m7410}|@b{-m7450}|@b{-m7455}|@b{-m750cl}|@b{-mppc64}|
@@ -79,11 +79,11 @@ Index: binutils-2.21.1/gas/doc/as.texinfo
     @b{-mpower4}|@b{-mpr4}|@b{-mpower5}|@b{-mpwr5}|@b{-mpwr5x}|@b{-mpower6}|@b{-mpwr6}|
     @b{-mpower7}|@b{-mpw7}|@b{-ma2}|@b{-mcell}|@b{-mspe}|@b{-mtitan}|@b{-me300}|@b{-mcom}]
    [@b{-many}] [@b{-maltivec}|@b{-mvsx}]
-Index: binutils-2.21.1/gas/doc/c-ppc.texi
+Index: binutils-2.22/gas/doc/c-ppc.texi
 ===================================================================
--- binutils-2.21.1.orig/gas/doc/c-ppc.texi
-+++ binutils-2.21.1/gas/doc/c-ppc.texi
-@@ -85,6 +85,9 @@ Generate code for Freescale e500mc core 
+--- binutils-2.22.orig/gas/doc/c-ppc.texi
+++ binutils-2.22/gas/doc/c-ppc.texi
+@@ -88,6 +88,9 @@ Generate code for Freescale e500mc core 
 @item -me500mc64
 Generate code for Freescale e500mc64 core complex.
 
@@ -93,10 +93,10 @@ Index: binutils-2.21.1/gas/doc/c-ppc.texi
 @item -mspe
 Generate code for Motorola SPE instructions.
 
-Index: binutils-2.21.1/opcodes/ppc-dis.c
+Index: binutils-2.22/opcodes/ppc-dis.c
 ===================================================================
--- binutils-2.21.1.orig/opcodes/ppc-dis.c
-+++ binutils-2.21.1/opcodes/ppc-dis.c
+--- binutils-2.22.orig/opcodes/ppc-dis.c
+++ binutils-2.22/opcodes/ppc-dis.c
@@ -114,6 +114,12 @@ struct ppc_mopt ppc_opts[] = {
 		| PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER5
 		| PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7),
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch
@@ -1,28 +1,32 @@
 Upstream-Status: Pending

--- binutils-2.18.orig/configure
-+++ binutils-2.18/configure
-@@ -2206,7 +2206,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+Index: binutils-2.22/configure
+===================================================================
+--- binutils-2.22.orig/configure
+++ binutils-2.22/configure
+@@ -3130,7 +3130,7 @@ case "${target}" in
     ;;
-  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+   s390-*-* | s390x-*-*)
     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2504,7 +2504,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+-  sh-*-* | sh[34]*-*-*)
+  sh*-*-* | sh[34]*-*-*)
+     ;;
+   sh64-*-* | sh5*-*-*)
+     ;;
+@@ -3570,7 +3570,7 @@ case "${target}" in
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
     ;;
 -  sh-*-* | sh64-*-*)
 +  sh*-*-* | sh64-*-*)
-     case "${host}" in
-       i[3456789]86-*-vsta) ;; # don't add gprof back in
-       i[3456789]86-*-go32*) ;; # don't add gprof back in
--- binutils-2.18.orig/gprof/configure
-+++ binutils-2.18/gprof/configure
-@@ -4124,6 +4124,11 @@
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+Index: binutils-2.22/gprof/configure
+===================================================================
+--- binutils-2.22.orig/gprof/configure
+++ binutils-2.22/gprof/configure
+@@ -6103,6 +6103,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch
@@ -27,9 +27,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]

@DPATCH@
--- binutils-2.16.91.0.1/ld/Makefile.am
-+++ binutils-2.16.91.0.1/ld/Makefile.am
-@@ -20,7 +20,7 @@
+Index: binutils-2.22/ld/Makefile.am
+===================================================================
+--- binutils-2.22.orig/ld/Makefile.am
+++ binutils-2.22/ld/Makefile.am
+@@ -37,7 +37,7 @@ endif
 # We put the scripts in the directory $(scriptdir)/ldscripts.
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
 # directives need to be different for native and cross linkers.
@@ -38,9 +40,11 @@ Upstream-Status: Inappropriate [debian patch]
 
 EMUL = @EMUL@
 EMULATION_OFILES = @EMULATION_OFILES@
--- binutils-2.16.91.0.1/ld/Makefile.in
-+++ binutils-2.16.91.0.1/ld/Makefile.in
-@@ -268,7 +268,7 @@
+Index: binutils-2.22/ld/Makefile.in
+===================================================================
+--- binutils-2.22.orig/ld/Makefile.in
+++ binutils-2.22/ld/Makefile.in
+@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
 # We put the scripts in the directory $(scriptdir)/ldscripts.
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
 # directives need to be different for native and cross linkers.
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch
@@ -25,10 +25,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]

@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
-+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
-@@ -150,6 +150,13 @@
+Index: binutils-2.22/bfd/opncls.c
+===================================================================
+--- binutils-2.22.orig/bfd/opncls.c
+++ binutils-2.22/bfd/opncls.c
+@@ -197,6 +197,13 @@ bfd_fopen (const char *filename, const c
 {
   bfd *nbfd;
   const bfd_target *target_vec;
--- 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)
--- a/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch
@@ -19,11 +19,11 @@ floatformat.c:(.text+0x43e): undefined reference to `ldexp'
 collect2: ld returned 1 exit status
 make[4]: *** [as-new] Error 1

-Index: binutils-2.17.50/gas/configure.tgt
+Index: binutils-2.22/gas/configure.tgt
 ===================================================================
--- binutils-2.17.50.orig/gas/configure.tgt
-+++ binutils-2.17.50/gas/configure.tgt
-@@ -408,6 +408,12 @@ case ${generic_target} in
+--- binutils-2.22.orig/gas/configure.tgt
+++ binutils-2.22/gas/configure.tgt
+@@ -428,6 +428,12 @@ case ${generic_target} in
   *-*-netware)				fmt=elf em=netware ;;
 esac
 
@@ -34,6 +34,5 @@ Index: binutils-2.17.50/gas/configure.tgt
 +esac
 +
 case ${cpu_type} in
-   alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
+   alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
     bfd_gas=yes
-
--- a/meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch
@@ -9,11 +9,13 @@
 # Adapted to binutils 2.18.50.0.7
 Upstream-Status: Inappropriate [embedded specific]

--- binutils/ld/emulparams/elf_i386.sh
-+++ binutils/ld/emulparams/elf_i386.sh
-@@ -12,3 +12,13 @@
+Index: binutils-2.22/ld/emulparams/elf_i386.sh
+===================================================================
+--- binutils-2.22.orig/ld/emulparams/elf_i386.sh
+++ binutils-2.22/ld/emulparams/elf_i386.sh
+@@ -14,3 +14,13 @@ GENERATE_PIE_SCRIPT=yes
+ NO_SMALL_DATA=yes
 SEPARATE_GOTPLT=12
- SHARABLE_SECTIONS=yes
 IREL_IN_PLT=
 +
 +# Linux modify the default library search path to first include
--- a/meta/recipes-devtools/binutils/binutils/clone-shadow.patch
+++ b/meta/recipes-devtools/binutils/binutils/clone-shadow.patch
@@ -11,11 +11,11 @@ binutils.
 Upstream-Status: Pending

 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: binutils-2.21.1/gas/config/obj-elf.c
+Index: binutils-2.22/gas/config/obj-elf.c
 ===================================================================
--- binutils-2.21.1.orig/gas/config/obj-elf.c	2011-03-23 07:14:03.000000000 -0700
-+++ binutils-2.21.1/gas/config/obj-elf.c	2011-07-16 19:05:57.003831035 -0700
-@@ -741,10 +741,10 @@
+--- binutils-2.22.orig/gas/config/obj-elf.c
+++ binutils-2.22/gas/config/obj-elf.c
+@@ -741,10 +741,10 @@ obj_elf_change_section (const char *name
 }
 
 static bfd_vma
@@ -28,7 +28,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
 
   while (len > 0)
     {
-@@ -775,7 +775,7 @@
+@@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str
 	  attr |= SHF_TLS;
 	  break;
 	case '?':
@@ -37,7 +37,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
 	  break;
 	/* Compatibility.  */
 	case 'm':
-@@ -978,7 +978,7 @@
+@@ -978,7 +978,7 @@ obj_elf_section (int push)
 
       if (*input_line_pointer == '"')
 	{
@@ -46,7 +46,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
 
 	  beg = demand_copy_C_string (&dummy);
 	  if (beg == NULL)
-@@ -986,7 +986,7 @@
+@@ -986,7 +986,7 @@ obj_elf_section (int push)
 	      ignore_rest_of_line ();
 	      return;
 	    }
@@ -55,7 +55,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
 
 	  SKIP_WHITESPACE ();
 	  if (*input_line_pointer == ',')
-@@ -1038,10 +1038,10 @@
+@@ -1038,10 +1038,10 @@ obj_elf_section (int push)
 	      attr &= ~SHF_MERGE;
 	    }
 
@@ -68,7 +68,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
 	    }
 	  if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',')
 	    {
-@@ -1063,7 +1063,7 @@
+@@ -1063,7 +1063,7 @@ obj_elf_section (int push)
 	      attr &= ~SHF_GROUP;
 	    }
 
--- a/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
+++ b/meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch
@@ -6,11 +6,11 @@ Thanks to RP for helping find the source code causing the issue.

 2010/08/13
 Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: binutils-2.20.1/libiberty/Makefile.in
+Index: binutils-2.22/libiberty/Makefile.in
 ===================================================================
--- binutils-2.20.1.orig/libiberty/Makefile.in
-+++ binutils-2.20.1/libiberty/Makefile.in
-@@ -327,7 +327,8 @@ install: install_to_$(INSTALL_DEST) inst
+--- binutils-2.22.orig/libiberty/Makefile.in
+++ binutils-2.22/libiberty/Makefile.in
+@@ -350,7 +350,8 @@ install-strip: install
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take CFLAGS into account as well,
 # since it will be passed the multilib flags.
--- a/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
+++ b/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch
--- a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
+++ b/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
@@ -8,10 +8,11 @@ upstream.
 Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> 
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>

-diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh
--- binutils-2.21.orig//ltmain.sh	2011-01-18 11:50:40.821710085 -0800
-+++ binutils-2.21/ltmain.sh	2011-01-18 11:51:38.774952785 -0800
-@@ -8035,9 +8035,11 @@
+Index: binutils-2.22/ltmain.sh
+===================================================================
+--- binutils-2.22.orig/ltmain.sh
+++ binutils-2.22/ltmain.sh
+@@ -8035,9 +8035,11 @@ EOF
 	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
@@ -25,7 +26,7 @@ diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
-@@ -8770,6 +8772,10 @@
+@@ -8770,6 +8772,10 @@ EOF
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
 	if test -n "$hardcode_libdir_flag_spec"; then
--- a/meta/recipes-devtools/binutils/binutils_2.21.1a.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.1a.bb
@@ -18,7 +18,6 @@ LIC_FILES_CHKSUM="\
 SRC_URI = "\
     ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
     file://binutils-uclibc-100-uclibc-conf.patch \
-     file://110-arm-eabi-conf.patch \
     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
     file://binutils-uclibc-300-006_better_file_error.patch \
     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
@@ -33,10 +32,8 @@ SRC_URI = "\
     file://binutils-powerpc-e5500.patch \
     "

-SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad"
-SRC_URI[sha256sum] = "cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654"
+SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5"
+SRC_URI[sha256sum] = "6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9"

-# 2.21.1a has a mismatched dir name within the tarball
-S = "${WORKDIR}/binutils-2.21.1"

 BBCLASSEXTEND = "native"