From ad88cd3cc63cc336105744a78680c3982400a26b Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 16 Feb 2011 13:51:31 +0000
Subject: [PATCH] [toolchain/binutils]: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25551 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches/2.20.1/112-arm-uclibc-gas-needs-libm.patch     | 7 ++-----
 toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch   | 4 ++--
 .../patches/2.20.1/310-backport_fPIE_mips_fix.patch        | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/toolchain/binutils/patches/2.20.1/112-arm-uclibc-gas-needs-libm.patch b/toolchain/binutils/patches/2.20.1/112-arm-uclibc-gas-needs-libm.patch
index abc8117e2..636639221 100644
--- a/toolchain/binutils/patches/2.20.1/112-arm-uclibc-gas-needs-libm.patch
+++ b/toolchain/binutils/patches/2.20.1/112-arm-uclibc-gas-needs-libm.patch
@@ -18,10 +18,8 @@ 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
-===================================================================
---- binutils-2.17.50.orig/gas/configure.tgt
-+++ binutils-2.17.50/gas/configure.tgt
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
 @@ -431,6 +431,12 @@ case ${generic_target} in
    *-*-netware)				fmt=elf em=netware ;;
  esac
@@ -35,4 +33,3 @@ Index: binutils-2.17.50/gas/configure.tgt
  case ${cpu_type} in
    alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
      bfd_gas=yes
-
diff --git a/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch b/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
index 56891432e..fd14fa1b3 100644
--- a/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
+++ b/toolchain/binutils/patches/2.20.1/200-mips_non_pic.patch
@@ -179,7 +179,7 @@
  
    if (! bfd_set_arch_mach (stdoutput, bfd_arch_mips, file_mips_arch))
      as_warn (_("Could not set architecture and machine"));
-@@ -11264,6 +11264,7 @@
+@@ -11258,6 +11264,7 @@ enum options
      OPTION_PDR,
      OPTION_NO_PDR,
      OPTION_MVXWORKS_PIC,
@@ -187,7 +187,7 @@
  #endif /* OBJ_ELF */
      OPTION_END_OF_ENUM    
    };
-@@ -11365,6 +11372,7 @@ struct option md_longopts[] =
+@@ -11359,6 +11366,7 @@ struct option md_longopts[] =
    {"mpdr", no_argument, NULL, OPTION_PDR},
    {"mno-pdr", no_argument, NULL, OPTION_NO_PDR},
    {"mvxworks-pic", no_argument, NULL, OPTION_MVXWORKS_PIC},
diff --git a/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch b/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
index 3a5dc6699..9a93728bb 100644
--- a/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
+++ b/toolchain/binutils/patches/2.20.1/310-backport_fPIE_mips_fix.patch
@@ -1,6 +1,6 @@
 --- a/bfd/elfxx-mips.c
 +++ b/bfd/elfxx-mips.c
-@@ -5696,9 +5696,9 @@ mips_elf_create_dynamic_relocation (bfd 
+@@ -5696,9 +5696,9 @@ mips_elf_create_dynamic_relocation (bfd
  
    /* We must now calculate the dynamic symbol table index to use
       in the relocation.  */