diff -u binutils-2.25.51.20151022/debian/changelog binutils-2.25.51.20151022/debian/changelog
--- binutils-2.25.51.20151022/debian/changelog
+++ binutils-2.25.51.20151022/debian/changelog
@@ -1,3 +1,9 @@
+binutils (2.25.51.20151022-0ubuntu2) xenial; urgency=medium
+
+  * Revert the fix for PR gold/19119, fixing gold on armhf and arm64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 25 Oct 2015 19:42:10 +0200
+
 binutils (2.25.51.20151022-0ubuntu1) xenial; urgency=medium
 
   * Snapshot, taken from the trunk 20151022.
diff -u binutils-2.25.51.20151022/debian/patches/series binutils-2.25.51.20151022/debian/patches/series
--- binutils-2.25.51.20151022/debian/patches/series
+++ binutils-2.25.51.20151022/debian/patches/series
@@ -27,2 +27,4 @@
 
+pr19119-revert.diff
+
 # patches taken from the trunk
only in patch2:
unchanged:
--- binutils-2.25.51.20151022.orig/debian/patches/pr19119-revert.diff
+++ binutils-2.25.51.20151022/debian/patches/pr19119-revert.diff
@@ -0,0 +1,21 @@
+Index: b/gold/parameters.cc
+===================================================================
+--- a/gold/parameters.cc
++++ b/gold/parameters.cc
+@@ -297,16 +297,6 @@ set_parameters_options(const General_opt
+ void
+ set_parameters_target(Target* target)
+ {
+-  if (parameters->options_valid() && parameters->options().user_set_m())
+-    {
+-      const char* emulation = parameters->options().m();
+-      Target* output = select_target_by_emulation(emulation);
+-      if (!output)
+-	gold_error(_("unrecognised output emulation: %s"), emulation);
+-      else if (output != target)
+-	gold_error(_("input file is incompatible with %s output emulation"),
+-		   emulation);
+-    }
+   static_parameters.set_target(target);
+ }
+