[package] base-files, busybox: fix 22279, simplify code and get rid of awk

[openwrt.git] / toolchain / binutils / patches / 2.20 / 200-mips_non_pic.patch

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 71799ff..5689143 100644 (file)
--- 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"));
  
    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},
    {"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 */
  
 +  {"mnon-pic-abicalls", no_argument, NULL, OPTION_NON_PIC_ABICALLS},
  #endif /* OBJ_ELF */