diff --git a/binutils-2.24-auto-plugin.diff b/binutils-2.24-auto-plugin.diff
deleted file mode 100644
index d3bf3c2..0000000
--- a/binutils-2.24-auto-plugin.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 92b1b67865c719e83d12578e584ca5e20d172eac
-Author: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date:   Thu Apr 3 11:33:17 2014 +0100
-
-    This patch allows one to place the gcc's liblto_plugin in the lib/bfd-plugins directory
-    and have it loaded by default (as long as the --target option isn't used).
-    
-    	PR binutils/14698
-    	ar.c: Set plugin_target early if plugins are supported.
-    	nm.c: Likewise.
-
-diff --git a/binutils/ar.c b/binutils/ar.c
-index 69f20f9..ebd9528 100644
---- a/binutils/ar.c
-+++ b/binutils/ar.c
-@@ -138,7 +138,11 @@ static int show_version = 0;
- 
- static int show_help = 0;
- 
-+#if BFD_SUPPORTS_PLUGINS
-+static const char *plugin_target = "plugin";
-+#else
- static const char *plugin_target = NULL;
-+#endif
- 
- static const char *target = NULL;
- 
-@@ -571,7 +575,6 @@ decode_options (int argc, char **argv)
-           break;
- 	case OPTION_PLUGIN:
- #if BFD_SUPPORTS_PLUGINS
--	  plugin_target = "plugin";
- 	  bfd_plugin_set_plugin (optarg);
- #else
- 	  fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
-@@ -632,7 +635,6 @@ ranlib_main (int argc, char **argv)
- 	  /* PR binutils/13493: Support plugins.  */
- 	case OPTION_PLUGIN:
- #if BFD_SUPPORTS_PLUGINS
--	  plugin_target = "plugin";
- 	  bfd_plugin_set_plugin (optarg);
- #else
- 	  fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
-diff --git a/binutils/nm.c b/binutils/nm.c
-index 15c48a3..2a44a84 100644
---- a/binutils/nm.c
-+++ b/binutils/nm.c
-@@ -175,7 +175,11 @@ static char other_format[] = "%02x";
- static char desc_format[] = "%04x";
- 
- static char *target = NULL;
--static char *plugin_target = NULL;
-+#if BFD_SUPPORTS_PLUGINS
-+static const char *plugin_target = "plugin";
-+#else
-+static const char *plugin_target = NULL;
-+#endif
- 
- /* Used to cache the line numbers for a BFD.  */
- static bfd *lineno_cache_bfd;
-@@ -1646,7 +1650,6 @@ main (int argc, char **argv)
- 
- 	case OPTION_PLUGIN:	/* --plugin */
- #if BFD_SUPPORTS_PLUGINS
--	  plugin_target = "plugin";
- 	  bfd_plugin_set_plugin (optarg);
- #else
- 	  fatal (_("sorry - this program has been built without plugin support\n"));
diff --git a/binutils-2.24-branch.diff.gz b/binutils-2.24-branch.diff.gz
deleted file mode 100644
index 96537bb..0000000
--- a/binutils-2.24-branch.diff.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f13b4fc6b0b2f09fc2003dafde6c21400226ed518f6ca72dac4456d1df6ee69
-size 96930
diff --git a/binutils-2.24-bso16746.diff b/binutils-2.24-bso16746.diff
deleted file mode 100644
index 218b40d..0000000
--- a/binutils-2.24-bso16746.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-commit 26c2ff33f8fcd57d52194a159226b639a4fee00c
-Author: H.J. Lu <hjl.tools@gmail.com>
-Date:   Tue Mar 25 13:33:51 2014 -0700
-
-    Don't issue a warning for reference in LTO IR
-    
-    References in LTO IR may be removed by LTO later.  Instead, make a
-    warning symbol if needed.  Warnings will be handled after LTO resolves
-    all references.
-    
-    bfd/
-    
-    	PR ld/16746
-    	* linker.c (_bfd_generic_link_add_one_symbol): Don't issue a
-    	warning for reference in LTO IR which may be removed by LTO later.
-    
-    ld/testsuite/
-    
-    	PR ld/16746
-    	* ld-plugin/lto.exp: Add 4 tests for PR ld/16746.
-    	* ld-plugin/pr16746a.c: New file.
-    	* ld-plugin/pr16746b.c: Likewise.
-    	* ld-plugin/pr16746c.c: Likewise.
-    	* ld-plugin/pr16746d.c: Likewise.
-
-Index: binutils-2.24/bfd/linker.c
-===================================================================
---- binutils-2.24.orig/bfd/linker.c	2014-05-06 16:08:45.649990914 +0200
-+++ binutils-2.24/bfd/linker.c	2014-05-06 16:08:49.819990627 +0200
-@@ -1904,8 +1904,10 @@ _bfd_generic_link_add_one_symbol (struct
- 	  break;
- 
- 	case WARNC:
--	  /* Issue a warning and cycle.  */
--	  if (h->u.i.warning != NULL)
-+	  /* Issue a warning and cycle.  Don't issue a warning for
-+	     reference in LTO IR which may be removed by LTO later. */
-+	  if (h->u.i.warning != NULL
-+	      && (abfd->flags & BFD_PLUGIN) == 0)
- 	    {
- 	      if (! (*info->callbacks->warning) (info, h->u.i.warning,
- 						 h->root.string, abfd,
-@@ -1930,6 +1932,11 @@ _bfd_generic_link_add_one_symbol (struct
- 	  break;
- 
- 	case WARN:
-+	  /* Don't issue a warning for reference in LTO IR which may be
-+	     removed by LTO later.  Make a warning symbol instead.  */
-+	  if ((hash_entry_bfd (h)->flags & BFD_PLUGIN) != 0)
-+	    goto mwarn;
-+
- 	  /* Issue a warning.  */
- 	  if (! (*info->callbacks->warning) (info, string, h->root.string,
- 					     hash_entry_bfd (h), NULL, 0))
-@@ -1951,6 +1958,7 @@ _bfd_generic_link_add_one_symbol (struct
- 	    }
- 	  /* Fall through.  */
- 	case MWARN:
-+mwarn:
- 	  /* Make a warning symbol.  */
- 	  {
- 	    struct bfd_link_hash_entry *sub;
-Index: binutils-2.24/ld/testsuite/ld-plugin/lto.exp
-===================================================================
---- binutils-2.24.orig/ld/testsuite/ld-plugin/lto.exp	2014-05-06 16:08:45.649990914 +0200
-+++ binutils-2.24/ld/testsuite/ld-plugin/lto.exp	2014-05-06 16:10:14.334984808 +0200
-@@ -206,6 +206,18 @@ set lto_link_elf_tests {
-   {"Build libpr15146d.a"
-    "" "-flto -O2"
-    {pr15146d.c} {} "lib15146d.a"}
-+  {"Build libpr16746a.a"
-+   "" ""
-+   {pr16746a.c pr16746b.c} {} "lib16746a.a"}
-+  {"Build libpr16746b.a"
-+   "" "-O2 -flto"
-+   {pr16746c.c pr16746d.c} {} "lib16746b.a"}
-+  {"PR ld/16746 (1)"
-+   "-O2 -flto -fuse-linker-plugin tmpdir/pr16746a.o tmpdir/pr16746c.o" "-O2 -flto"
-+   {dummy.c} {} "pr16746a.exe"}
-+  {"PR ld/16746 (2)"
-+   "-O2 -flto -fuse-linker-plugin tmpdir/pr16746c.o tmpdir/pr16746a.o" "-O2 -flto"
-+   {dummy.c} {} "pr16746b.exe"}
- }
- 
- # Check final symbols in executables.
-@@ -309,6 +321,20 @@ if { [is_elf_format]
- 	pass $testname
-     } {
- 	fail $testname
-+    }
-+    set testname "PR ld/16746 (3)"
-+    set exec_output [run_host_cmd "$CC" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin tmpdir/pr16746b.o tmpdir/pr16746d.o"]
-+    if { [ regexp "warning: foobar" $exec_output ] && ![ regexp "symbol from plugin" $exec_output ] } {
-+	pass $testname
-+    } {
-+	fail $testname
-+    }
-+    set testname "PR ld/16746 (4)"
-+    set exec_output [run_host_cmd "$CC" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin tmpdir/pr16746d.o tmpdir/pr16746b.o"]
-+    if { [ regexp "warning: foobar" $exec_output ] && ![ regexp "symbol from plugin" $exec_output ] } {
-+	pass $testname
-+    } {
-+	fail $testname
-     }
- }
- 
-Index: binutils-2.24/ld/testsuite/ld-plugin/pr16746a.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ binutils-2.24/ld/testsuite/ld-plugin/pr16746a.c	2014-05-06 16:08:49.819990627 +0200
-@@ -0,0 +1,3 @@
-+static const char __evoke_link_warning_foobar[]
-+ __attribute__ ((used, section (".gnu.warning.foobar\n\t#")))
-+ = "foobar";
-Index: binutils-2.24/ld/testsuite/ld-plugin/pr16746b.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ binutils-2.24/ld/testsuite/ld-plugin/pr16746b.c	2014-05-06 16:08:49.820990627 +0200
-@@ -0,0 +1,5 @@
-+static const char __evoke_link_warning_foobar[]
-+ __attribute__ ((used, section (".gnu.warning.foobar\n\t#")))
-+ = "foobar";
-+
-+void foobar (void) {}
-Index: binutils-2.24/ld/testsuite/ld-plugin/pr16746c.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ binutils-2.24/ld/testsuite/ld-plugin/pr16746c.c	2014-05-06 16:08:49.820990627 +0200
-@@ -0,0 +1,8 @@
-+extern void foobar (void);
-+int
-+main (int argc, char **argv)
-+{
-+  if (__builtin_constant_p (argc))
-+    foobar ();
-+  return 0;
-+}
-Index: binutils-2.24/ld/testsuite/ld-plugin/pr16746d.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ binutils-2.24/ld/testsuite/ld-plugin/pr16746d.c	2014-05-06 16:08:49.820990627 +0200
-@@ -0,0 +1,8 @@
-+extern void foobar (void);
-+int
-+main (int argc, char **argv)
-+{
-+  if (!__builtin_constant_p (argc))
-+    foobar ();
-+  return 0;
-+}
diff --git a/binutils-2.24.90.tar.bz2 b/binutils-2.24.90.tar.bz2
new file mode 100644
index 0000000..a7141e5
--- /dev/null
+++ b/binutils-2.24.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84fbe69b50edc8424655cdf8537d150e21e03744f27f9f0deb2b17334921f6d7
+size 24817475
diff --git a/binutils-2.24.tar.bz2 b/binutils-2.24.tar.bz2
deleted file mode 100644
index f4e3776..0000000
--- a/binutils-2.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-size 22716802
diff --git a/binutils-skip-rpaths.patch b/binutils-skip-rpaths.patch
index 3374b48..e7d6290 100644
--- a/binutils-skip-rpaths.patch
+++ b/binutils-skip-rpaths.patch
@@ -1,8 +1,8 @@
 Index: ld/emultempl/elf32.em
 ===================================================================
---- ld/emultempl/elf32.em.orig	2013-03-25 09:06:23.000000000 +0100
-+++ ld/emultempl/elf32.em	2013-03-28 13:48:32.031001794 +0100
-@@ -1440,8 +1440,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
+--- ld/emultempl/elf32.em.orig	2014-10-14 17:18:40.000000000 +0200
++++ ld/emultempl/elf32.em	2014-10-14 17:20:23.000000000 +0200
+@@ -1357,8 +1357,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
    else
      ELF_INTERPRETER_SET_DEFAULT=
    fi
@@ -41,7 +41,7 @@ Index: ld/emultempl/elf32.em
  /* used by before_allocation and handle_option. */
  static void
  gld${EMULATION_NAME}_append_to_separated_string (char **to, char *op_arg)
-@@ -1488,7 +1518,7 @@ gld${EMULATION_NAME}_append_to_separated
+@@ -1405,7 +1435,7 @@ gld${EMULATION_NAME}_append_to_separated
  static void
  gld${EMULATION_NAME}_before_allocation (void)
  {
@@ -49,8 +49,8 @@ Index: ld/emultempl/elf32.em
 +  char *rpath;
    asection *sinterp;
    bfd *abfd;
- 
-@@ -1504,7 +1534,65 @@ gld${EMULATION_NAME}_before_allocation (
+   struct elf_link_hash_entry *ehdr_start = NULL;
+@@ -1457,7 +1487,65 @@ gld${EMULATION_NAME}_before_allocation (
       by dynamic linking.  */
    rpath = command_line.rpath;
    if (rpath == NULL)
@@ -115,5 +115,5 @@ Index: ld/emultempl/elf32.em
 +       }
 +    }
  
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/binutils.changes b/binutils.changes
index 71256fb..539db8e 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
 -------------------------------------------------------------------
 Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
 
diff --git a/binutils.spec b/binutils.spec
index b48d637..f301738 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -35,7 +35,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -82,7 +82,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -96,10 +95,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -155,7 +150,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -170,10 +165,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 1ef60ac..784391c 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index b46973c..539db8e 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 384eac2..ca0c688 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index b46973c..539db8e 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 226b7c5..aaccaad 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index b46973c..539db8e 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 2796fdb..7233e6f 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index b46973c..539db8e 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 2bec2b7..bfcfd26 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index a689f07..8018f4c 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index b46973c..539db8e 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 41e4696..a89dea9 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 797a776..d4f8ceb 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index b46973c..539db8e 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 780f98e..1fd9a90 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index b46973c..539db8e 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 32813c9..980cc71 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index b46973c..539db8e 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 0a3fe91..0bbadbb 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index bb9e47d..52f4f60 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index b46973c..539db8e 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index d26611e..804d6d6 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index b46973c..539db8e 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 41d8057..01882ca 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index b46973c..539db8e 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 022ae0c..a8c6529 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index b46973c..539db8e 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index c3e6c6d..0ea7c75 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index e891124..26ced6b 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index b46973c..539db8e 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 9acd5d6..d614db9 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index b46973c..539db8e 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  1 16:33:29 UTC 2014 - matz@suse.de
+
+- Update to current 2.25 pre-release branch, at 127a4644.
+
+-------------------------------------------------------------------
+Fri Oct 31 10:49:03 UTC 2014 - afaerber@suse.de
+
+- Enable Adapteva Epiphany target
+
 -------------------------------------------------------------------
 Tue May  6 14:02:26 UTC 2014 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 0b45a26..3c50d00 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.24
+Version:        2.24.90
 Release:        0
 #
 # RUN_TESTS
@@ -85,7 +85,6 @@ Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.24-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -99,10 +98,6 @@ Patch12:        s390-pic-dso.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch22:        binutils-bfd_h.patch
-Patch23:        pie-m68k.patch
-Patch24:        binutils-2.24-auto-plugin.diff
-Patch25:        ld-testsuite.patch
-Patch26:        binutils-2.24-bso16746.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -158,7 +153,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %setup -q -n binutils-%{binutils_version}
 # Patch1 is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-%patch1 -p1
+#%patch1 -p1
 %if !%{test_vanilla}
 %patch3
 %patch4
@@ -173,10 +168,6 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch22
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/ld-relro.diff b/ld-relro.diff
index 8c8e07e..8954078 100644
--- a/ld-relro.diff
+++ b/ld-relro.diff
@@ -1,8 +1,8 @@
 Index: ld/lexsup.c
 ===================================================================
---- ld/lexsup.c.orig	2012-07-13 15:20:26.000000000 +0200
-+++ ld/lexsup.c	2012-09-14 14:00:57.262167402 +0200
-@@ -608,6 +608,9 @@ parse_args (unsigned argc, char **argv)
+--- ld/lexsup.c.orig	2014-10-14 17:43:07.000000000 +0200
++++ ld/lexsup.c	2014-10-14 17:43:26.000000000 +0200
+@@ -623,6 +623,9 @@ parse_args (unsigned argc, char **argv)
  	}
      }
  
@@ -14,9 +14,9 @@ Index: ld/lexsup.c
      {
 Index: ld/testsuite/config/default.exp
 ===================================================================
---- ld/testsuite/config/default.exp.orig	2012-03-15 02:57:57.000000000 +0100
-+++ ld/testsuite/config/default.exp	2012-09-14 14:00:57.263167402 +0200
-@@ -23,7 +23,7 @@
+--- ld/testsuite/config/default.exp.orig	2014-10-14 17:43:07.000000000 +0200
++++ ld/testsuite/config/default.exp	2014-10-14 17:44:58.000000000 +0200
+@@ -22,7 +22,7 @@
  #
  
  if ![info exists ld] then {
@@ -25,16 +25,16 @@ Index: ld/testsuite/config/default.exp
  }
  
  if ![info exists as] then {
-@@ -69,7 +69,7 @@ if {![file isdirectory tmpdir/ld]} then
-     catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+@@ -60,7 +60,7 @@ if {![file isdirectory tmpdir/ld]} then
      catch "exec ln -s ld tmpdir/ld/collect-ld" status
+     catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status
  }
--set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
-+set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
+-set gcc_B_opt "-B[pwd]/tmpdir/ld/"
++set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
  
  # load the linker path
- if {[file exists tmpdir/libpath.exp]} {
-@@ -279,7 +279,7 @@ if ![info exists READELFFLAGS] then {
+ set ld_L_opt ""
+@@ -272,7 +272,7 @@ if ![info exists READELFFLAGS] then {
  }
  
  if ![info exists LD] then {
@@ -45,9 +45,9 @@ Index: ld/testsuite/config/default.exp
  if ![info exists LDFLAGS] then {
 Index: ld/testsuite/ld-bootstrap/bootstrap.exp
 ===================================================================
---- ld/testsuite/ld-bootstrap/bootstrap.exp.orig	2011-12-03 18:13:01.000000000 +0100
-+++ ld/testsuite/ld-bootstrap/bootstrap.exp	2012-09-14 14:00:57.263167402 +0200
-@@ -71,7 +71,12 @@ foreach flags {"" "strip" "--static" "--
+--- ld/testsuite/ld-bootstrap/bootstrap.exp.orig	2014-10-14 17:43:07.000000000 +0200
++++ ld/testsuite/ld-bootstrap/bootstrap.exp	2014-10-14 17:43:26.000000000 +0200
+@@ -78,7 +78,12 @@ foreach flags $test_flags {
  
      # This test can only be run if we have the ld build directory,
      # since we need the object files.
diff --git a/ld-testsuite.patch b/ld-testsuite.patch
deleted file mode 100644
index 847ea86..0000000
--- a/ld-testsuite.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: binutils-2.24/ld/testsuite/ld-plugin/lto.exp
-===================================================================
---- binutils-2.24.orig/ld/testsuite/ld-plugin/lto.exp
-+++ binutils-2.24/ld/testsuite/ld-plugin/lto.exp
-@@ -29,8 +29,8 @@ global CFLAGS
- global CXXFLAGS
- set saved_CFLAGS "$CFLAGS"
- set saved_CXXFLAGS "$CXXFLAGS"
--regsub -all "\\-Wp,-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
--regsub -all "\\-Wp,-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
-+regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
-+regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
- 
- proc restore_notify { } {
-   global saved_CFLAGS
-@@ -70,7 +70,7 @@ set lto_link_tests {
-    {lto-6.c} {} "lto-6.exe" "c"}
-   {"Build libdummy.a 9"
-    "" "-O2 -finline -flto"
--   {lto-9.cc} {} "libdummy.a"}
-+   {lto-9.cc} {} "libdummy.a" "c++"}
-   {"Build libdummy.a 11a"
-    "" "-O -flto"
-    {lto-11a.c} {} "libdummy.a"}
-@@ -106,7 +106,7 @@ set lto_link_tests {
-    {lto-15b.c} {} "liblto-15.a"}
-   {"PR ld/12696"
-    "-O2 -flto -fuse-linker-plugin -r -nostdlib" "-O2 -flto"
--   {pr12696-1.cc} {} "pr12696-1r.o" "c"}
-+   {pr12696-1.cc} {} "pr12696-1r.o" "c++"}
-   {"Build libdummy.a PR ld/12758"
-    "" ""
-    {pr12758a.s} {} "libdummy.a"}
diff --git a/pie-m68k.patch b/pie-m68k.patch
deleted file mode 100644
index 3d4942d..0000000
--- a/pie-m68k.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2013-10-08  Andreas Schwab  <schwab@suse.de>
-
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Add DT_DEBUG also
-	for PIE executables.
-
-diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
-index a46efb9..34dc75f 100644
---- a/bfd/elf32-m68k.c
-+++ b/bfd/elf32-m68k.c
-@@ -3367,7 +3367,7 @@ elf_m68k_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
- #define add_dynamic_entry(TAG, VAL) \
-   _bfd_elf_add_dynamic_entry (info, TAG, VAL)
- 
--      if (!info->shared)
-+      if (info->executable)
- 	{
- 	  if (!add_dynamic_entry (DT_DEBUG, 0))
- 	    return FALSE;
diff --git a/use-hashtype-both-by-default.diff b/use-hashtype-both-by-default.diff
index efd165b..3bdf44e 100644
--- a/use-hashtype-both-by-default.diff
+++ b/use-hashtype-both-by-default.diff
@@ -1,8 +1,8 @@
 Index: ld/ldmain.c
 ===================================================================
---- ld/ldmain.c.orig
-+++ ld/ldmain.c
-@@ -279,6 +279,7 @@ main (int argc, char **argv)
+--- ld/ldmain.c.orig	2014-10-14 17:52:24.000000000 +0200
++++ ld/ldmain.c	2014-10-14 17:52:24.000000000 +0200
+@@ -280,6 +280,7 @@ main (int argc, char **argv)
    link_info.combreloc = TRUE;
    link_info.strip_discarded = TRUE;
    link_info.emit_hash = TRUE;
@@ -12,9 +12,9 @@ Index: ld/ldmain.c
    /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init
 Index: ld/testsuite/config/default.exp
 ===================================================================
---- ld/testsuite/config/default.exp.orig
-+++ ld/testsuite/config/default.exp
-@@ -23,7 +23,7 @@
+--- ld/testsuite/config/default.exp.orig	2014-10-14 17:52:24.000000000 +0200
++++ ld/testsuite/config/default.exp	2014-10-14 17:52:24.000000000 +0200
+@@ -22,7 +22,7 @@
  #
  
  if ![info exists ld] then {
@@ -23,16 +23,16 @@ Index: ld/testsuite/config/default.exp
  }
  
  if ![info exists as] then {
-@@ -69,7 +69,7 @@ if {![file isdirectory tmpdir/ld]} then
-     catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+@@ -60,7 +60,7 @@ if {![file isdirectory tmpdir/ld]} then
      catch "exec ln -s ld tmpdir/ld/collect-ld" status
+     catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status
  }
--set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
-+set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro -Wl,--hash-style=sysv"
+-set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
++set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro -Wl,--hash-style=sysv"
  
  # load the linker path
- if {[file exists tmpdir/libpath.exp]} {
-@@ -279,7 +279,7 @@ if ![info exists READELFFLAGS] then {
+ set ld_L_opt ""
+@@ -272,7 +272,7 @@ if ![info exists READELFFLAGS] then {
  }
  
  if ![info exists LD] then {
diff --git a/x86-64-biarch.patch b/x86-64-biarch.patch
index 554c1f1..53fdec0 100644
--- a/x86-64-biarch.patch
+++ b/x86-64-biarch.patch
@@ -1,12 +1,15 @@
 Index: ld/emulparams/elf_i386.sh
 ===================================================================
---- ld/emulparams/elf_i386.sh.orig	2013-09-20 15:29:51.000000000 +0200
-+++ ld/emulparams/elf_i386.sh	2013-09-20 15:30:48.000000000 +0200
-@@ -20,6 +20,7 @@ case "$target" in
-   x86_64*-linux* | i[3-7]86*-linux*)
-     case "$EMULATION_NAME" in
-       *i386*) LIBPATH_SUFFIX=32 ;;
-+      *64*) LIBPATH_SUFFIX=64 ;;
+--- ld/emulparams/elf_i386.sh.orig	2014-10-14 17:39:02.000000000 +0200
++++ ld/emulparams/elf_i386.sh	2014-10-14 17:39:44.000000000 +0200
+@@ -23,6 +23,10 @@ case "$target" in
+ 	LIBPATH_SUFFIX=32
+ 	LIBPATH_SUFFIX_SKIP=64
+ 	;;
++      *64*)
++	LIBPATH_SUFFIX=64
++	LIBPATH_SUFFIX_SKIP=32
++	;;
      esac
      ;;
  esac