summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-05 01:49:20 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-05 01:49:20 +0000
commit92b9209394cdd729c9b967efbb739c89da6d28ec (patch)
tree6b24af26527c27882d1772aa9a34550a2e1eba39
parentea4600ff65ca71a211a2b820dfecc114790aef4a (diff)
binutils: fix build errors in 2.20 (patch from #6094)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18307 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/binutils/patches/2.20/200-mips_non_pic.patch11
1 files changed, 9 insertions, 2 deletions
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 71799ff1f..56891432e 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 */