diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 7275eaf8..2dbbb4a0 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -8,32 +8,16 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config BINUTILS_V_2_21
-    bool
-    depends on EXPERIMENTAL
-    prompt "2.21"
-    select BINUTILS_2_21_or_later
-
 config BINUTILS_V_2_20_1
     bool
     prompt "2.20.1"
     select BINUTILS_2_20_or_later
 
-config BINUTILS_V_2_20
-    bool
-    prompt "2.20"
-    select BINUTILS_2_20_or_later
-
 config BINUTILS_V_2_19_1
     bool
     prompt "2.19.1"
     select BINUTILS_2_19_or_later
 
-config BINUTILS_V_2_19
-    bool
-    prompt "2.19"
-    select BINUTILS_2_19_or_later
-
 config BINUTILS_V_2_18
     bool
     prompt "2.18"
@@ -55,11 +39,8 @@ config BINUTILS_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "2.21" if BINUTILS_V_2_21
     default "2.20.1" if BINUTILS_V_2_20_1
-    default "2.20" if BINUTILS_V_2_20
     default "2.19.1" if BINUTILS_V_2_19_1
-    default "2.19" if BINUTILS_V_2_19
     default "2.18" if BINUTILS_V_2_18
     default "2.17" if BINUTILS_V_2_17
     default "2.16.1" if BINUTILS_V_2_16_1
diff --git a/patches/binutils/2.19/100-ppc64-pie.patch b/patches/binutils/2.19/100-ppc64-pie.patch
deleted file mode 100644
index 5543ca4b..00000000
--- a/patches/binutils/2.19/100-ppc64-pie.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
-
-diff -durN binutils-2.19.orig/bfd/elf64-ppc.c binutils-2.19/bfd/elf64-ppc.c
---- binutils-2.19.orig/bfd/elf64-ppc.c	2008-10-09 14:18:24.000000000 +0200
-+++ binutils-2.19/bfd/elf64-ppc.c	2008-11-23 16:16:11.000000000 +0100
-@@ -11294,7 +11294,12 @@
- 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
- 		       && !is_opd
- 		       && r_type != R_PPC64_TOC)
--		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		{
-+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		  if (h->elf.dynindx == -1
-+		      && h->elf.root.type == bfd_link_hash_undefweak)
-+		  memset (&outrel, 0, sizeof outrel);
-+		}
- 	      else
- 		{
- 		  /* This symbol is local, or marked to become local,
diff --git a/patches/binutils/2.19/110-RPATH_ENVVAR-smack.patch b/patches/binutils/2.19/110-RPATH_ENVVAR-smack.patch
deleted file mode 100644
index 3638ae83..00000000
--- a/patches/binutils/2.19/110-RPATH_ENVVAR-smack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/08_all_binutils-RPATH_ENVVAR-smack.patch
-
-http://sourceware.org/ml/binutils/2007-07/msg00401.html
-http://sourceware.org/bugzilla/show_bug.cgi?id=4970
-
-diff -durN binutils-2.19.orig/configure binutils-2.19/configure
---- binutils-2.19.orig/configure	2008-09-04 04:18:16.000000000 +0200
-+++ binutils-2.19/configure	2008-11-23 16:22:02.000000000 +0100
-@@ -5601,6 +5601,7 @@
-   *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
-   *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
- esac
-+RPATH_ENVVAR="cant_touch_this_nah_nah_nah"
- 
- # On systems where the dynamic library environment variable is PATH,
- if test "$RPATH_ENVVAR" = PATH; then
diff --git a/patches/binutils/2.19/120-sh-targets.patch b/patches/binutils/2.19/120-sh-targets.patch
deleted file mode 100644
index 7cc0211a..00000000
--- a/patches/binutils/2.19/120-sh-targets.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/12_all_sh-targets.patch
-
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we
-fix that up too.. now we're able to actually build a real toolchain for
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more
-inept targets than that one, really. Go look, I promise).
-
-diff -durN binutils-2.19.orig/configure binutils-2.19/configure
---- binutils-2.19.orig/configure	2008-11-23 16:23:44.000000000 +0100
-+++ binutils-2.19/configure	2008-11-23 16:23:57.000000000 +0100
-@@ -2281,7 +2281,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2606,7 +2606,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  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
-diff -durN binutils-2.19.orig/configure.ac binutils-2.19/configure.ac
---- binutils-2.19.orig/configure.ac	2008-10-16 15:45:42.000000000 +0200
-+++ binutils-2.19/configure.ac	2008-11-23 16:23:57.000000000 +0100
-@@ -530,7 +530,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -855,7 +855,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  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
diff --git a/patches/binutils/2.19/130-check_ldrunpath_length.patch b/patches/binutils/2.19/130-check_ldrunpath_length.patch
deleted file mode 100644
index 8a602b88..00000000
--- a/patches/binutils/2.19/130-check_ldrunpath_length.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/42_all_012_check_ldrunpath_length.patch
-
-Originaly from Debian:
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-diff -durN binutils-2.19.orig/ld/emultempl/elf32.em binutils-2.19/ld/emultempl/elf32.em
---- binutils-2.19.orig/ld/emultempl/elf32.em	2008-09-07 06:02:31.000000000 +0200
-+++ binutils-2.19/ld/emultempl/elf32.em	2008-11-23 16:25:51.000000000 +0100
-@@ -1219,6 +1219,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1404,6 +1406,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (link_info.output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/patches/binutils/2.19/140-pt-pax-flags-20081101.patch b/patches/binutils/2.19/140-pt-pax-flags-20081101.patch
deleted file mode 100644
index f424e4a0..00000000
--- a/patches/binutils/2.19/140-pt-pax-flags-20081101.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/63_all_binutils-2.19-pt-pax-flags-20081101.patch
-
-diff -durN binutils-2.19.orig/bfd/elf-bfd.h binutils-2.19/bfd/elf-bfd.h
---- binutils-2.19.orig/bfd/elf-bfd.h	2008-08-21 01:28:58.000000000 +0200
-+++ binutils-2.19/bfd/elf-bfd.h	2008-11-23 16:31:09.000000000 +0100
-@@ -1526,6 +1526,9 @@
-   /* Segment flags for the PT_GNU_STACK segment.  */
-   unsigned int stack_flags;
- 
-+  /* Segment flags for the PT_PAX_FLAGS segment.  */
-+  unsigned int pax_flags;
-+
-   /* Symbol version definitions in external objects.  */
-   Elf_Internal_Verdef *verdef;
- 
-diff -durN binutils-2.19.orig/bfd/elf.c binutils-2.19/bfd/elf.c
---- binutils-2.19.orig/bfd/elf.c	2008-10-09 14:18:23.000000000 +0200
-+++ binutils-2.19/bfd/elf.c	2008-11-23 16:31:09.000000000 +0100
-@@ -1136,6 +1136,7 @@
-     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
-     case PT_GNU_STACK: pt = "STACK"; break;
-     case PT_GNU_RELRO: pt = "RELRO"; break;
-+    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
-     default: pt = NULL; break;
-     }
-   return pt;
-@@ -2442,6 +2443,9 @@
-     case PT_GNU_RELRO:
-       return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
- 
-+    case PT_PAX_FLAGS:
-+      return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
-+
-     default:
-       /* Check for any processor-specific program segment types.  */
-       bed = get_elf_backend_data (abfd);
-@@ -3404,6 +3408,11 @@
-       ++segs;
-     }
- 
-+    {
-+      /* We need a PT_PAX_FLAGS segment.  */
-+      ++segs;
-+    }
-+
-   for (s = abfd->sections; s != NULL; s = s->next)
-     {
-       if ((s->flags & SEC_LOAD) != 0
-@@ -3983,6 +3992,20 @@
- 	    }
- 	}
- 
-+    {
-+      amt = sizeof (struct elf_segment_map);
-+      m = bfd_zalloc (abfd, amt);
-+      if (m == NULL)
-+	goto error_return;
-+      m->next = NULL;
-+      m->p_type = PT_PAX_FLAGS;
-+      m->p_flags = elf_tdata (abfd)->pax_flags;
-+      m->p_flags_valid = 1;
-+
-+      *pm = m;
-+      pm = &m->next;
-+    }
-+
-       free (sections);
-       elf_tdata (abfd)->segment_map = mfirst;
-     }
-@@ -5173,7 +5196,8 @@
-        6. PT_TLS segment includes only SHF_TLS sections.
-        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
-        8. PT_DYNAMIC should not contain empty sections at the beginning
--	  (with the possible exception of .dynamic).  */
-+	  (with the possible exception of .dynamic).
-+       9. PT_PAX_FLAGS segments does not include any sections.  */
- #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
-   ((((segment->p_paddr							\
-       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
-@@ -5181,6 +5205,7 @@
-      && (section->flags & SEC_ALLOC) != 0)				\
-     || IS_NOTE (segment, section))					\
-    && segment->p_type != PT_GNU_STACK					\
-+   && segment->p_type != PT_PAX_FLAGS					\
-    && (segment->p_type != PT_TLS					\
-        || (section->flags & SEC_THREAD_LOCAL))				\
-    && (segment->p_type == PT_LOAD					\
-diff -durN binutils-2.19.orig/bfd/elflink.c binutils-2.19/bfd/elflink.c
---- binutils-2.19.orig/bfd/elflink.c	2008-08-22 10:32:39.000000000 +0200
-+++ binutils-2.19/bfd/elflink.c	2008-11-23 16:31:09.000000000 +0100
-@@ -5397,16 +5397,30 @@
-     return TRUE;
- 
-   bed = get_elf_backend_data (output_bfd);
-+  elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
-+
-+  if (info->execheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
-+  else if (info->noexecheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
-+
-   if (info->execstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+      elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+    }
-   else if (info->noexecstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-+    }
-   else
-     {
-       bfd *inputobj;
-       asection *notesec = NULL;
-       int exec = 0;
- 
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-       for (inputobj = info->input_bfds;
- 	   inputobj;
- 	   inputobj = inputobj->link_next)
-@@ -5419,7 +5433,11 @@
- 	  if (s)
- 	    {
- 	      if (s->flags & SEC_CODE)
--		exec = PF_X;
-+		{
-+		  elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
-+		  elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+		  exec = PF_X;
-+		}
- 	      notesec = s;
- 	    }
- 	  else if (bed->default_execstack)
-diff -durN binutils-2.19.orig/binutils/readelf.c binutils-2.19/binutils/readelf.c
---- binutils-2.19.orig/binutils/readelf.c	2008-09-17 11:00:44.000000000 +0200
-+++ binutils-2.19/binutils/readelf.c	2008-11-23 16:31:09.000000000 +0100
-@@ -2505,6 +2505,7 @@
- 			return "GNU_EH_FRAME";
-     case PT_GNU_STACK:	return "GNU_STACK";
-     case PT_GNU_RELRO:  return "GNU_RELRO";
-+    case PT_PAX_FLAGS:  return "PAX_FLAGS";
- 
-     default:
-       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
-diff -durN binutils-2.19.orig/include/bfdlink.h binutils-2.19/include/bfdlink.h
---- binutils-2.19.orig/include/bfdlink.h	2008-08-17 05:12:50.000000000 +0200
-+++ binutils-2.19/include/bfdlink.h	2008-11-23 16:31:09.000000000 +0100
-@@ -319,6 +319,14 @@
-   /* TRUE if PT_GNU_RELRO segment should be created.  */
-   unsigned int relro: 1;
- 
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
-+     flags.  */
-+  unsigned int execheap: 1;
-+
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
-+     flags.  */
-+  unsigned int noexecheap: 1;
-+
-   /* TRUE if we should warn when adding a DT_TEXTREL to a shared object.  */
-   unsigned int warn_shared_textrel: 1;
- 
-diff -durN binutils-2.19.orig/include/elf/common.h binutils-2.19/include/elf/common.h
---- binutils-2.19.orig/include/elf/common.h	2008-08-04 01:20:42.000000000 +0200
-+++ binutils-2.19/include/elf/common.h	2008-11-23 16:31:09.000000000 +0100
-@@ -360,6 +360,7 @@
- #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
- #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
- #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
-+#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
- 
- /* Program segment permissions, in program header p_flags field.  */
- 
-@@ -370,6 +371,21 @@
- #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
- #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
- 
-+/* Flags to control PaX behavior.  */
-+
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
-+
- /* Values for section header, sh_type field.  */
- 
- #define SHT_NULL	0		/* Section header table entry unused */
-diff -durN binutils-2.19.orig/ld/emultempl/elf32.em binutils-2.19/ld/emultempl/elf32.em
---- binutils-2.19.orig/ld/emultempl/elf32.em	2008-11-23 16:30:36.000000000 +0100
-+++ binutils-2.19/ld/emultempl/elf32.em	2008-11-23 16:31:09.000000000 +0100
-@@ -2146,6 +2146,16 @@
- 	  link_info.noexecstack = TRUE;
- 	  link_info.execstack = FALSE;
- 	}
-+      else if (strcmp (optarg, "execheap") == 0)
-+	{
-+	  link_info.execheap = TRUE;
-+	  link_info.noexecheap = FALSE;
-+	}
-+      else if (strcmp (optarg, "noexecheap") == 0)
-+	{
-+	  link_info.noexecheap = TRUE;
-+	  link_info.execheap = FALSE;
-+	}
- EOF
- 
-   if test -n "$COMMONPAGESIZE"; then
-@@ -2229,6 +2239,8 @@
-   fprintf (file, _("\
-   -z execstack                Mark executable as requiring executable stack\n"));
-   fprintf (file, _("\
-+  -z execheap\t\tMark executable as requiring executable heap\n"));
-+  fprintf (file, _("\
-   -z initfirst                Mark DSO to be initialized first at runtime\n"));
-   fprintf (file, _("\
-   -z interpose                Mark object to interpose all DSOs but executable\n"));
-@@ -2252,6 +2264,8 @@
-   -z nodump                   Mark DSO not available to dldump\n"));
-   fprintf (file, _("\
-   -z noexecstack              Mark executable as not requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z noexecheap\tMark executable as not requiring executable heap\n"));
- EOF
- 
-   if test -n "$COMMONPAGESIZE"; then
-diff -durN binutils-2.19.orig/ld/ldgram.y binutils-2.19/ld/ldgram.y
---- binutils-2.19.orig/ld/ldgram.y	2008-07-06 15:38:36.000000000 +0200
-+++ binutils-2.19/ld/ldgram.y	2008-11-23 16:31:09.000000000 +0100
-@@ -1112,6 +1112,8 @@
- 			    $$ = exp_intop (0x6474e550);
- 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
- 			    $$ = exp_intop (0x6474e551);
-+			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
-+			    $$ = exp_intop (0x65041580);
- 			  else
- 			    {
- 			      einfo (_("\
diff --git a/patches/binutils/2.19/150-warn-textrel.patch b/patches/binutils/2.19/150-warn-textrel.patch
deleted file mode 100644
index 5e14f70a..00000000
--- a/patches/binutils/2.19/150-warn-textrel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/66_all_binutils-2.18.50.0.2-warn-textrel.patch
-
-textrels are bad for forcing copy-on-write (this affects everyone),
-and for security/runtime code generation, this affects security ppl.
-But in either case, it doesn't matter who needs textrels, it's
-the very fact that they're needed at all.
-
-diff -durN binutils-2.19.orig/bfd/elflink.c binutils-2.19/bfd/elflink.c
---- binutils-2.19.orig/bfd/elflink.c	2008-11-23 16:49:47.000000000 +0100
-+++ binutils-2.19/bfd/elflink.c	2008-11-23 16:49:14.000000000 +0100
-@@ -10820,14 +10820,12 @@
- 	goto error_return;
- 
-       /* Check for DT_TEXTREL (late, in case the backend removes it).  */
--      if (info->warn_shared_textrel && info->shared)
-+      o = bfd_get_section_by_name (dynobj, ".dynamic");
-+      if (info->warn_shared_textrel && o != NULL)
- 	{
- 	  bfd_byte *dyncon, *dynconend;
- 
- 	  /* Fix up .dynamic entries.  */
--	  o = bfd_get_section_by_name (dynobj, ".dynamic");
--	  BFD_ASSERT (o != NULL);
--
- 	  dyncon = o->contents;
- 	  dynconend = o->contents + o->size;
- 	  for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
-@@ -10839,7 +10837,7 @@
- 	      if (dyn.d_tag == DT_TEXTREL)
- 		{
- 		 info->callbacks->einfo
--		    (_("%P: warning: creating a DT_TEXTREL in a shared object.\n"));
-+		    (_("%P: warning: creating a DT_TEXTREL in object.\n"));
- 		  break;
- 		}
- 	    }
-diff -durN binutils-2.19.orig/ld/ldmain.c binutils-2.19/ld/ldmain.c
---- binutils-2.19.orig/ld/ldmain.c	2008-08-17 05:12:50.000000000 +0200
-+++ binutils-2.19/ld/ldmain.c	2008-11-23 16:52:37.000000000 +0100
-@@ -274,6 +274,7 @@
-   link_info.relax_pass = 1;
-   link_info.pei386_auto_import = -1;
-   link_info.spare_dynamic_tags = 5;
-+  link_info.warn_shared_textrel = TRUE;
-   link_info.path_separator = ':';
- 
-   ldfile_add_arch ("");
diff --git a/patches/binutils/2.19/160-use-new-ld-dtags.patch b/patches/binutils/2.19/160-use-new-ld-dtags.patch
deleted file mode 100644
index a1dd72f2..00000000
--- a/patches/binutils/2.19/160-use-new-ld-dtags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/76_all_use-new-ld-dtags.patch
-
-diff -durN binutils-2.19.orig/ld/ldmain.c binutils-2.19/ld/ldmain.c
---- binutils-2.19.orig/ld/ldmain.c	2008-11-23 16:54:42.000000000 +0100
-+++ binutils-2.19/ld/ldmain.c	2008-11-23 16:56:16.000000000 +0100
-@@ -262,6 +262,7 @@
- 
-   link_info.allow_undefined_version = TRUE;
-   link_info.keep_memory = TRUE;
-+  link_info.new_dtags = TRUE;
-   link_info.combreloc = TRUE;
-   link_info.strip_discarded = TRUE;
-   link_info.emit_hash = TRUE;
diff --git a/patches/binutils/2.19/170-use-relro.patch b/patches/binutils/2.19/170-use-relro.patch
deleted file mode 100644
index e990e9a5..00000000
--- a/patches/binutils/2.19/170-use-relro.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/78_all_use-relro.patch
-
-diff -durN binutils-2.19.orig/ld/ldmain.c binutils-2.19/ld/ldmain.c
---- binutils-2.19.orig/ld/ldmain.c	2008-11-23 16:59:24.000000000 +0100
-+++ binutils-2.19/ld/ldmain.c	2008-11-23 16:59:45.000000000 +0100
-@@ -264,6 +264,7 @@
-   link_info.keep_memory = TRUE;
-   link_info.new_dtags = TRUE;
-   link_info.combreloc = TRUE;
-+  link_info.relro = TRUE;
-   link_info.strip_discarded = TRUE;
-   link_info.emit_hash = TRUE;
- #ifndef __mips__
diff --git a/patches/binutils/2.19/180-libiberty-pic.patch b/patches/binutils/2.19/180-libiberty-pic.patch
deleted file mode 100644
index 644ec1e5..00000000
--- a/patches/binutils/2.19/180-libiberty-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Original patch from Gentoo:
-gentoo/src/patchsets/binutils/2.19/91_all_libiberty-pic.patch
-
-diff -durN binutils-2.19.orig/libiberty/Makefile.in binutils-2.19/libiberty/Makefile.in
---- binutils-2.19.orig/libiberty/Makefile.in	2008-07-24 15:51:49.000000000 +0200
-+++ binutils-2.19/libiberty/Makefile.in	2008-11-23 17:03:33.000000000 +0100
-@@ -227,6 +227,7 @@
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
diff --git a/patches/binutils/2.20/100-ppc64-pie.patch b/patches/binutils/2.20/100-ppc64-pie.patch
deleted file mode 100644
index 20918a54..00000000
--- a/patches/binutils/2.20/100-ppc64-pie.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- binutils/bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
-+++ binutils/bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
-@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
- 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
- 		       && !is_opd
- 		       && r_type != R_PPC64_TOC)
--		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		{
-+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		  if (h->elf.dynindx == -1
-+		      && h->elf.root.type == bfd_link_hash_undefweak)
-+		  memset (&outrel, 0, sizeof outrel);
-+		}
- 	      else
- 		{
- 		  /* This symbol is local, or marked to become local,
diff --git a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch b/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch
deleted file mode 100644
index cf84e252..00000000
--- a/patches/binutils/2.20/110-RPATH_ENVVAR-smack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/binutils/2007-07/msg00401.html
-http://sourceware.org/bugzilla/show_bug.cgi?id=4970
-
---- binutils/configure
-+++ binutils/configure
-@@ -5601,6 +5601,7 @@ case "${host}" in
-   *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
-   *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
- esac
-+RPATH_ENVVAR="cant_touch_this_nah_nah_nah"
- 
- # On systems where the dynamic library environment variable is PATH,
- if test "$RPATH_ENVVAR" = PATH; then
diff --git a/patches/binutils/2.20/120-sh-targets.patch b/patches/binutils/2.20/120-sh-targets.patch
deleted file mode 100644
index ca1a1f71..00000000
--- a/patches/binutils/2.20/120-sh-targets.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- binutils-2.20-dist/configure
-+++ binutils-2.20/configure
-@@ -3054,7 +3054,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -3390,7 +3390,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  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.20-dist/configure.ac
-+++ binutils-2.20/configure.ac
-@@ -424,7 +424,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-     ;;    
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -712,7 +712,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-     ;;
--  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
diff --git a/patches/binutils/2.20/130-ld-sysroot.patch b/patches/binutils/2.20/130-ld-sysroot.patch
deleted file mode 100644
index 9b52a248..00000000
--- a/patches/binutils/2.20/130-ld-sysroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- binutils/ld/ldfile.c
-+++ binutils/ld/ldfile.c
-@@ -308,18 +308,24 @@
-      directory first.  */
-   if (! entry->is_archive)
-     {
--      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location. */
-+      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
-+      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	{
- 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
- 	    && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/patches/binutils/2.20/140-check_ldrunpath_length.patch b/patches/binutils/2.20/140-check_ldrunpath_length.patch
deleted file mode 100644
index fce6ae1d..00000000
--- a/patches/binutils/2.20/140-check_ldrunpath_length.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.20/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -871,6 +873,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (link_info.output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/patches/binutils/2.20/150-pt-pax-flags-20090909.patch b/patches/binutils/2.20/150-pt-pax-flags-20090909.patch
deleted file mode 100644
index f0a99054..00000000
--- a/patches/binutils/2.20/150-pt-pax-flags-20090909.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- binutils-2.20/bfd/elf-bfd.h
-+++ binutils-2.20/bfd/elf-bfd.h
-@@ -1527,6 +1527,9 @@ struct elf_obj_tdata
-   /* Segment flags for the PT_GNU_STACK segment.  */
-   unsigned int stack_flags;
- 
-+  /* Segment flags for the PT_PAX_FLAGS segment.  */
-+  unsigned int pax_flags;
-+
-   /* Symbol version definitions in external objects.  */
-   Elf_Internal_Verdef *verdef;
- 
---- binutils-2.20/bfd/elf.c
-+++ binutils-2.20/bfd/elf.c
-@@ -1081,6 +1081,7 @@ get_segment_type (unsigned int p_type)
-     case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
-     case PT_GNU_STACK: pt = "STACK"; break;
-     case PT_GNU_RELRO: pt = "RELRO"; break;
-+    case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break;
-     default: pt = NULL; break;
-     }
-   return pt;
-@@ -2379,6 +2380,9 @@ bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int index)
-     case PT_GNU_RELRO:
-       return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "relro");
- 
-+    case PT_PAX_FLAGS:
-+      return _bfd_elf_make_section_from_phdr (abfd, hdr, index, "pax_flags");
-+
-     default:
-       /* Check for any processor-specific program segment types.  */
-       bed = get_elf_backend_data (abfd);
-@@ -3393,6 +3397,11 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
-       ++segs;
-     }
- 
-+    {
-+      /* We need a PT_PAX_FLAGS segment.  */
-+      ++segs;
-+    }
-+
-   for (s = abfd->sections; s != NULL; s = s->next)
-     {
-       if ((s->flags & SEC_LOAD) != 0
-@@ -3972,6 +3981,20 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
- 	    }
- 	}
- 
-+    {
-+      amt = sizeof (struct elf_segment_map);
-+      m = bfd_zalloc (abfd, amt);
-+      if (m == NULL)
-+	goto error_return;
-+      m->next = NULL;
-+      m->p_type = PT_PAX_FLAGS;
-+      m->p_flags = elf_tdata (abfd)->pax_flags;
-+      m->p_flags_valid = 1;
-+
-+      *pm = m;
-+      pm = &m->next;
-+    }
-+
-       free (sections);
-       elf_tdata (abfd)->segment_map = mfirst;
-     }
-@@ -5176,7 +5199,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-        6. PT_TLS segment includes only SHF_TLS sections.
-        7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
-        8. PT_DYNAMIC should not contain empty sections at the beginning
--	  (with the possible exception of .dynamic).  */
-+	  (with the possible exception of .dynamic).
-+       9. PT_PAX_FLAGS segments do not include any sections.  */
- #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
-   ((((segment->p_paddr							\
-       ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
-@@ -5184,6 +5208,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
-      && (section->flags & SEC_ALLOC) != 0)				\
-     || IS_NOTE (segment, section))					\
-    && segment->p_type != PT_GNU_STACK					\
-+   && segment->p_type != PT_PAX_FLAGS					\
-    && (segment->p_type != PT_TLS					\
-        || (section->flags & SEC_THREAD_LOCAL))				\
-    && (segment->p_type == PT_LOAD					\
---- binutils-2.20/bfd/elflink.c
-+++ binutils-2.20/bfd/elflink.c
-@@ -5465,16 +5465,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
-     return TRUE;
- 
-   bed = get_elf_backend_data (output_bfd);
-+
-+  elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC;
-+  if (info->execheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT;
-+  else if (info->noexecheap)
-+    elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT;
-+
-   if (info->execstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
-+      elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+    }
-   else if (info->noexecstack)
--    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+    {
-+      elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-+    }
-   else
-     {
-       bfd *inputobj;
-       asection *notesec = NULL;
-       int exec = 0;
- 
-+      elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP;
-       for (inputobj = info->input_bfds;
- 	   inputobj;
- 	   inputobj = inputobj->link_next)
-@@ -5487,7 +5501,11 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
- 	  if (s)
- 	    {
- 	      if (s->flags & SEC_CODE)
--		exec = PF_X;
-+		{
-+		  elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP;
-+		  elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP;
-+		  exec = PF_X;
-+		}
- 	      notesec = s;
- 	    }
- 	  else if (bed->default_execstack)
---- binutils-2.20/binutils/readelf.c
-+++ binutils-2.20/binutils/readelf.c
-@@ -2556,6 +2556,7 @@ get_segment_type (unsigned long p_type)
- 			return "GNU_EH_FRAME";
-     case PT_GNU_STACK:	return "GNU_STACK";
-     case PT_GNU_RELRO:  return "GNU_RELRO";
-+    case PT_PAX_FLAGS:  return "PAX_FLAGS";
- 
-     default:
-       if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
---- binutils-2.20/include/bfdlink.h
-+++ binutils-2.20/include/bfdlink.h
-@@ -319,6 +319,14 @@ struct bfd_link_info
-   /* TRUE if PT_GNU_RELRO segment should be created.  */
-   unsigned int relro: 1;
- 
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT
-+     flags.  */
-+  unsigned int execheap: 1;
-+
-+  /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT
-+     flags.  */
-+  unsigned int noexecheap: 1;
-+
-   /* TRUE if we should warn when adding a DT_TEXTREL to a shared object.  */
-   unsigned int warn_shared_textrel: 1;
- 
---- binutils-2.20/include/elf/common.h
-+++ binutils-2.20/include/elf/common.h
-@@ -422,6 +422,7 @@
- #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
- #define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
- #define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
-+#define PT_PAX_FLAGS	(PT_LOOS + 0x5041580) /* PaX flags */
- 
- /* Program segment permissions, in program header p_flags field.  */
- 
-@@ -432,6 +433,21 @@
- #define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
- #define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
- 
-+/* Flags to control PaX behavior.  */
-+
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
-+
- /* Values for section header, sh_type field.  */
- 
- #define SHT_NULL	0		/* Section header table entry unused */
---- binutils-2.20/ld/emultempl/elf32.em
-+++ binutils-2.20/ld/emultempl/elf32.em
-@@ -2159,6 +2159,16 @@ fragment <<EOF
- 	  link_info.noexecstack = TRUE;
- 	  link_info.execstack = FALSE;
- 	}
-+      else if (strcmp (optarg, "execheap") == 0)
-+	{
-+	  link_info.execheap = TRUE;
-+	  link_info.noexecheap = FALSE;
-+	}
-+      else if (strcmp (optarg, "noexecheap") == 0)
-+	{
-+	  link_info.noexecheap = TRUE;
-+	  link_info.execheap = FALSE;
-+	}
- EOF
- 
-   if test -n "$COMMONPAGESIZE"; then
-@@ -2237,6 +2247,8 @@ fragment <<EOF
-   fprintf (file, _("\
-   -z execstack                Mark executable as requiring executable stack\n"));
-   fprintf (file, _("\
-+  -z execheap                 Mark executable as requiring executable heap\n"));
-+  fprintf (file, _("\
-   -z initfirst                Mark DSO to be initialized first at runtime\n"));
-   fprintf (file, _("\
-   -z interpose                Mark object to interpose all DSOs but executable\n"));
-@@ -2260,6 +2272,8 @@ fragment <<EOF
-   -z nodump                   Mark DSO not available to dldump\n"));
-   fprintf (file, _("\
-   -z noexecstack              Mark executable as not requiring executable stack\n"));
-+  fprintf (file, _("\
-+  -z noexecheap               Mark executable as not requiring executable heap\n"));
- EOF
- 
-   if test -n "$COMMONPAGESIZE"; then
---- binutils-2.20/ld/ldgram.y
-+++ binutils-2.20/ld/ldgram.y
-@@ -1116,6 +1116,8 @@ phdr_type:
- 			    $$ = exp_intop (0x6474e550);
- 			  else if (strcmp (s, "PT_GNU_STACK") == 0)
- 			    $$ = exp_intop (0x6474e551);
-+			  else if (strcmp (s, "PT_PAX_FLAGS") == 0)
-+			    $$ = exp_intop (0x65041580);
- 			  else
- 			    {
- 			      einfo (_("\
diff --git a/patches/binutils/2.20/160-amd64-32bit-path.patch b/patches/binutils/2.20/160-amd64-32bit-path.patch
deleted file mode 100644
index 673338eb..00000000
--- a/patches/binutils/2.20/160-amd64-32bit-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- binutils/ld/emulparams/elf_i386.sh
-+++ binutils/ld/emulparams/elf_i386.sh
-@@ -13,3 +13,13 @@
- NO_SMALL_DATA=yes
- SEPARATE_GOTPLT=12
- IREL_IN_PLT=
-+
-+# In Gentoo, we install 32bit libs into /lib32 in an
-+# ABI setup with amd64/x86
-+case "$target" in
-+  x86_64*-linux*)
-+    case "$EMULATION_NAME" in
-+      *i386*) LIBPATH_SUFFIX=32  ;;
-+    esac
-+  ;;
-+esac
diff --git a/patches/binutils/2.20/170-warn-textrel.patch b/patches/binutils/2.20/170-warn-textrel.patch
deleted file mode 100644
index 0d7596a6..00000000
--- a/patches/binutils/2.20/170-warn-textrel.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-textrels are bad for forcing copy-on-write (this affects everyone),
-and for security/runtime code generation, this affects security ppl.
-But in either case, it doesn't matter who needs textrels, it's
-the very fact that they're needed at all.
-
-2006-06-10  Ned Ludd  <solar@gentoo.org>, Mike Frysinger <vapier@gentoo.org>
-
-	* bfd/elflink.c (bfd_elf_final_link): Check all objects for TEXTRELs.
-	* ld/ldmain.c (main): Change textrel warning default to true.
-	* ld/testsuite/lib/ld-lib.exp (default_ld_simple_link): Scrub TEXTREL
-	warnings from ld output.
-
---- binutils/bfd/elflink.c
-+++ binutils/bfd/elflink.c
-@@ -8652,14 +8652,12 @@
- 	goto error_return;
- 
-       /* Check for DT_TEXTREL (late, in case the backend removes it).  */
--      if (info->warn_shared_textrel && info->shared)
-+      o = bfd_get_section_by_name (dynobj, ".dynamic");
-+      if (info->warn_shared_textrel && o != NULL)
- 	{
- 	  bfd_byte *dyncon, *dynconend;
- 
- 	  /* Fix up .dynamic entries.  */
--	  o = bfd_get_section_by_name (dynobj, ".dynamic");
--	  BFD_ASSERT (o != NULL);
--
- 	  dyncon = o->contents;
- 	  dynconend = o->contents + o->size;
- 	  for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
-@@ -8702,7 +8702,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
- 	      if (dyn.d_tag == DT_TEXTREL)
- 		{
- 		 info->callbacks->einfo
--		    (_("%P: warning: creating a DT_TEXTREL in a shared object.\n"));
-+		    (_("%P: warning: creating a DT_TEXTREL in object.\n"));
- 		  break;
- 		}
- 	    }
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -282,2 +282,3 @@ main (int argc, char **argv)
-   link_info.spare_dynamic_tags = 5;
-+  link_info.warn_shared_textrel = TRUE;
-   link_info.sharable_sections = FALSE;
---- binutils/ld/testsuite/lib/ld-lib.exp
-+++ binutils/ld/testsuite/lib/ld-lib.exp
-@@ -181,6 +181,10 @@ proc default_ld_simple_link { ld target 
-     # symbol, since the default linker script might use ENTRY.
-     regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
- 
-+    # Gentoo tweak:
-+    # We want to ignore TEXTREL warnings since we force enable them by default
-+    regsub -all "^lt-ld-new: warning: creating a DT_TEXTREL in object\." $exec_output "\\1" exec_output
-+
-     if [string match "" $exec_output] then {
- 	return 1
-     } else {
diff --git a/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled b/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled
deleted file mode 100644
index 89895795..00000000
--- a/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't generate RPATH if we're going to be generating RUNPATH.
-
-need to ponder what ramifications this has before enabling it
-
---- binutils/bfd/elflink.c
-+++ binutils/bfd/elflink.c
-@@ -5382,11 +5382,15 @@
- 
- 	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
- 				      TRUE);
--	  if (indx == (bfd_size_type) -1
--	      || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
-+	  if (indx == (bfd_size_type) -1)
- 	    return FALSE;
- 
--	  if  (info->new_dtags)
-+	  if (!info->new_dtags)
-+	    {
-+	      if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
-+		return FALSE;
-+	    }
-+	  else
- 	    {
- 	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
- 	      if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))
diff --git a/patches/binutils/2.20/190-use-new-ld-dtags.patch b/patches/binutils/2.20/190-use-new-ld-dtags.patch
deleted file mode 100644
index 84e20f70..00000000
--- a/patches/binutils/2.20/190-use-new-ld-dtags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -296,6 +296,7 @@ main (int argc, char **argv)
- 
-   link_info.allow_undefined_version = TRUE;
-   link_info.keep_memory = TRUE;
-+  link_info.new_dtags = TRUE;
-   link_info.combreloc = TRUE;
-   link_info.strip_discarded = TRUE;
-   link_info.callbacks = &link_callbacks;
diff --git a/patches/binutils/2.20/200-document-new-dtags-behaviour.patch b/patches/binutils/2.20/200-document-new-dtags-behaviour.patch
deleted file mode 100644
index 0013a2dd..00000000
--- a/patches/binutils/2.20/200-document-new-dtags-behaviour.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: binutils-2.19.51.0.5/ld/ld.texinfo
-===================================================================
---- binutils-2.19.51.0.5.orig/ld/ld.texinfo
-+++ binutils-2.19.51.0.5/ld/ld.texinfo
-@@ -2036,8 +2036,9 @@ This linker can create the new dynamic t
- systems may not understand them. If you specify
- @option{--enable-new-dtags}, the dynamic tags will be created as needed.
- If you specify @option{--disable-new-dtags}, no new dynamic tags will be
--created. By default, the new dynamic tags are not created. Note that
--those options are only available for ELF systems.
-+created. On Gentoo, by default, the new dynamic tags are created (this
-+differs from upstream behaviour). Note that those options are only
-+available for ELF systems.
- 
- @kindex --hash-size=@var{number}
- @item --hash-size=@var{number}
diff --git a/patches/binutils/2.20/220-use-relro.patch b/patches/binutils/2.20/220-use-relro.patch
deleted file mode 100644
index abd5187c..00000000
--- a/patches/binutils/2.20/220-use-relro.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -293,2 +293,3 @@ main (int argc, char **argv)
-   link_info.combreloc = TRUE;
-+  link_info.relro = TRUE;
-   link_info.strip_discarded = TRUE;
diff --git a/patches/binutils/2.20/230-libiberty-pic.patch b/patches/binutils/2.20/230-libiberty-pic.patch
deleted file mode 100644
index fcce13d6..00000000
--- a/patches/binutils/2.20/230-libiberty-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- binutils/libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
-+++ binutils/libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
-@@ -224,6 +224,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
diff --git a/patches/binutils/2.20/240-ld_makefile.patch b/patches/binutils/2.20/240-ld_makefile.patch
deleted file mode 100644
index c1ae311d..00000000
--- a/patches/binutils/2.20/240-ld_makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: correct where ld scripts are installed
-Author: Chris Chimelis <chris@debian.org>
-
---- binutils-2.16.91.0.1/ld/Makefile.am
-+++ binutils-2.16.91.0.1/ld/Makefile.am
-@@ -20,7 +20,7 @@
- # 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.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- 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 @@
- # 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.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.20/250-arm-eabi-conf.patch b/patches/binutils/2.20/250-arm-eabi-conf.patch
deleted file mode 100644
index d5be3bbd..00000000
--- a/patches/binutils/2.20/250-arm-eabi-conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.20.orig/configure binutils-2.20/configure
---- binutils-2.20.orig/configure	2010-01-05 11:15:44.000000000 +0100
-+++ binutils-2.20/configure	2010-01-05 12:25:41.000000000 +0100
-@@ -3086,7 +3086,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-diff -u binutils-2.20.orig/configure.ac binutils-2.20/configure.ac
---- binutils-2.20.orig/configure.ac	2010-01-05 11:15:44.000000000 +0100
-+++ binutils-2.20/configure.ac	2010-01-05 12:25:51.000000000 +0100
-@@ -573,7 +573,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
diff --git a/patches/binutils/2.20/260-arm-non-empty-know.patch b/patches/binutils/2.20/260-arm-non-empty-know.patch
deleted file mode 100644
index f0f54b2b..00000000
--- a/patches/binutils/2.20/260-arm-non-empty-know.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This is backported partially from 2.20 branch
-
-http://sourceware.org/ml/binutils-cvs/2009-10/msg00173.html
-
--Khem
-Index: binutils-2.20/gas/as.h
-===================================================================
---- binutils-2.20.orig/gas/as.h	2009-10-22 00:27:08.700469349 -0700
-+++ binutils-2.20/gas/as.h	2009-10-22 00:28:04.068416318 -0700
-@@ -238,7 +238,7 @@ typedef addressT valueT;
- #define know(p) gas_assert(p)	/* Verify our assumptions!  */
- #endif /* not yet defined */
- #else
--#define know(p)			/* know() checks are no-op.ed  */
-+#define know(p) do {} while (0)	/* know() checks are no-op.ed  */
- #endif
- 
- /* input_scrub.c */
diff --git a/patches/binutils/2.20/270-better_file_error.patch b/patches/binutils/2.20/270-better_file_error.patch
deleted file mode 100644
index f337611e..00000000
--- a/patches/binutils/2.20/270-better_file_error.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Specify which filename is causing an error if the filename is a
-## DP: directory. (#45832)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@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 @@
- {
-   bfd *nbfd;
-   const bfd_target *target_vec;
-+  struct stat s;
-+
-+  if (stat (filename, &s) == 0)
-+    if (S_ISDIR(s.st_mode)) {
-+      bfd_set_error (bfd_error_file_not_recognized);
-+      return NULL;
-+    }
- 
-   nbfd = _bfd_new_bfd ();
-   if (nbfd == NULL)
diff --git a/patches/binutils/2.20/280-unexport_LD_LIBRARY_PATH.patch b/patches/binutils/2.20/280-unexport_LD_LIBRARY_PATH.patch
deleted file mode 100644
index 535d714b..00000000
--- a/patches/binutils/2.20/280-unexport_LD_LIBRARY_PATH.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description:
-
-This patch is needed in situations where build system is running same version of
-binutils that is intended to be built  cross-native ( build != host = target)
- and has shared libraries enabled. binutils/binutils
-Makefile has some tools which are built to run on build system. Toplevel makefile
-for binutils passes HOST_EXPORTS to sub-makefiles which also include RPATH_ENVVARS
-containing LD_LIBRARY_PATH which is modified so that it also includes host libraries
-like opcodes and libbfd which are just built for the host system. 
-
-Now the problem is that same LD_LIBRARY_PATH value gets set in environment even
-for the tools that are being built for build system using CC_FOR_BUILD and the tools
-like as,ld it invokes from build machine get the LD_LIBRARY_PATH set to search
-the newly build host libraries like opcodes and bfd and if host is like a big endian
-system say (mips-linux) the build system linker and assembler do not run because
-ld.so tries to load these shared libraries instead of the ones from /usr/lib for 
-the build tools. 
-
-This patch fixes the issue by clearing LD_LIBRARY_PATH for BUILD tools
-
-This patch would be needed on other versions of binutils. I just cared about 2.20
-May be upstream is also interested in such a patch.
-
--Khem
-
-Index: binutils-2.20/binutils/Makefile.am
-===================================================================
---- binutils-2.20.orig/binutils/Makefile.am	2009-12-30 15:30:35.302438121 -0800
-+++ binutils-2.20/binutils/Makefile.am	2009-12-30 15:33:09.154420373 -0800
-@@ -251,24 +251,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sy
- 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
- 
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
--	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
-+	LD_LIBRARY_PATH= $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
- 
- syslex.o: syslex.c sysinfo.h config.h
- 	if [ -r syslex.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
- 	fi
- 
- sysinfo.o: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
- 	fi
- 
- bin2c$(EXEEXT_FOR_BUILD):
--	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
-+	LD_LIBRARY_PATH= $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
- 
- embedspu: embedspu.sh
- 	sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@
-Index: binutils-2.20/binutils/Makefile.in
-===================================================================
---- binutils-2.20.orig/binutils/Makefile.in	2009-12-30 15:30:44.582922535 -0800
-+++ binutils-2.20/binutils/Makefile.in	2009-12-30 15:33:47.322422313 -0800
-@@ -1193,24 +1193,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sy
- 	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
- 
- sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
--	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
-+	LD_LIBRARY_PATH= $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o
- 
- syslex.o: syslex.c sysinfo.h config.h
- 	if [ -r syslex.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\
- 	fi
- 
- sysinfo.o: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
-+	  LD_LIBRARY_PATH= $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \
- 	fi
- 
- bin2c$(EXEEXT_FOR_BUILD):
--	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
-+	LD_LIBRARY_PATH= $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c
- 
- embedspu: embedspu.sh
- 	sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@
diff --git a/patches/binutils/2.20/290-ld-stub-crash.patch b/patches/binutils/2.20/290-ld-stub-crash.patch
deleted file mode 100644
index e4723e55..00000000
--- a/patches/binutils/2.20/290-ld-stub-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -p -c -u -r1.196 elf32-arm.c
---- a/bfd/elf32-arm.c	22 May 2009 11:58:44 -0000	1.196
-+++ b/bfd/elf32-arm.c	12 Jun 2009 13:18:20 -0000
-@@ -3175,11 +3175,15 @@ arm_type_of_stub (struct bfd_link_info *
- 
- 	  /* We have an extra 2-bytes reach because of
- 	     the mode change (bit 24 (H) of BLX encoding).  */
-+	  /* A stub is needed only if this call is not throught a PLT
-+	     entry, because PLT stubs handle mode switching
-+	     already.  */
- 	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)
- 	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)
--	      || ((r_type == R_ARM_CALL) && !globals->use_blx)
--	      || (r_type == R_ARM_JUMP24)
--	      || (r_type == R_ARM_PLT32))
-+	      || ( (((r_type == R_ARM_CALL) && !globals->use_blx)
-+		    || (r_type == R_ARM_JUMP24)
-+		    || (r_type == R_ARM_PLT32))
-+		   && !use_plt))
- 	    {
- 	      stub_type = (info->shared | globals->pic_veneer)
- 		/* PIC stubs.  */
diff --git a/patches/binutils/2.20/300-mips64-defaultemul.patch b/patches/binutils/2.20/300-mips64-defaultemul.patch
deleted file mode 100644
index 62a8493c..00000000
--- a/patches/binutils/2.20/300-mips64-defaultemul.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- binutils-2.20/ld/configure.tgt.orig	2010-02-20 04:05:31.000000000 -0500
-+++ binutils-2.20/ld/configure.tgt	2010-02-20 04:08:11.000000000 -0500
-@@ -400,11 +400,11 @@
- mips*-*-vxworks*)	targ_emul=elf32ebmipvxworks
- 		        targ_extra_emuls="elf32elmipvxworks" ;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss ;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls ;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls ;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip
- 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"