From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 5 Nov 2009 01:49:20 +0000 (+0000)
Subject: binutils: fix build errors in 2.20 (patch from #6094)
X-Git-Tag: v19.07.0-rc1~32610
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6007ab61ec08b07069a18c0c578e3ae355d142bf;p=openwrt%2Fstaging%2Fhauke.git

binutils: fix build errors in 2.20 (patch from #6094)

SVN-Revision: 18307
---

diff --git a/toolchain/binutils/patches/2.20/200-mips_non_pic.patch b/toolchain/binutils/patches/2.20/200-mips_non_pic.patch
index 71799ff1fe..56891432e7 100644
--- a/toolchain/binutils/patches/2.20/200-mips_non_pic.patch
+++ b/toolchain/binutils/patches/2.20/200-mips_non_pic.patch
@@ -179,11 +179,18 @@
  
    if (! bfd_set_arch_mach (stdoutput, bfd_arch_mips, file_mips_arch))
      as_warn (_("Could not set architecture and machine"));
-@@ -11359,6 +11365,8 @@ struct option md_longopts[] =
+@@ -11264,6 +11264,7 @@
+     OPTION_PDR,
+     OPTION_NO_PDR,
+     OPTION_MVXWORKS_PIC,
++    OPTION_NON_PIC_ABICALLS,
+ #endif /* OBJ_ELF */
+     OPTION_END_OF_ENUM    
+   };
+@@ -11365,6 +11372,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},
-+#define OPTION_NON_PIC_ABICALLS (OPTION_ELF_BASE + 13)
 +  {"mnon-pic-abicalls", no_argument, NULL, OPTION_NON_PIC_ABICALLS},
  #endif /* OBJ_ELF */