diff -Nru rustc-1.25.0+dfsg1/debian/architecture.mk rustc-1.25.0+dfsg1/debian/architecture.mk
--- rustc-1.25.0+dfsg1/debian/architecture.mk	2018-03-28 11:15:44.000000000 +0000
+++ rustc-1.25.0+dfsg1/debian/architecture.mk	2018-06-20 22:12:21.000000000 +0000
@@ -2,10 +2,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-rust_cpu = $(subst i586,i686,\
-$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\
-$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\
-$(1))))
+rust_cpu = $(subst i586,i686,$(1))
 rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM)
 
 $(foreach machine,BUILD HOST TARGET,\
diff -Nru rustc-1.25.0+dfsg1/debian/changelog rustc-1.25.0+dfsg1/debian/changelog
--- rustc-1.25.0+dfsg1/debian/changelog	2018-05-19 20:10:33.000000000 +0000
+++ rustc-1.25.0+dfsg1/debian/changelog	2018-06-20 22:12:21.000000000 +0000
@@ -1,3 +1,14 @@
+rustc (1.25.0+dfsg1-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
+  * Build for armv6.
+  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+  [changes introduced in 1.24.1+dfsg1-1+rpi1 by Peter Michael Green]
+  * Remove -march=native from src/binaryen/CMakeLists.txt
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 22:12:21 +0000
+
 rustc (1.25.0+dfsg1-2) unstable; urgency=medium
 
   * Add patches for LLVM's compiler-rt to fix bugs on sparc64 and mips64.
diff -Nru rustc-1.25.0+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch rustc-1.25.0+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch
--- rustc-1.25.0+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch	1970-01-01 00:00:00.000000000 +0000
+++ rustc-1.25.0+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch	2018-06-20 22:12:21.000000000 +0000
@@ -0,0 +1,19 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 22 Mar 2018 23:44:06 +0000
+X-Dgit-Generated: 1.24.1+dfsg1-1+rpi1 a186e4e5762b6af08f55b0ea5ede6c03c8d6c8c4
+Subject: Remove -march=native from src/binaryen/CMakeLists.txt
+
+
+---
+
+--- rustc-1.24.1+dfsg1.orig/src/binaryen/CMakeLists.txt
++++ rustc-1.24.1+dfsg1/src/binaryen/CMakeLists.txt
+@@ -143,7 +143,7 @@ ELSE()
+       ADD_COMPILE_FLAG("-mfpmath=sse")
+     elseif(TARGET_ARCH STREQUAL "ARM")
+       # stub for ARM-specific instructions. GCC6 adds NEON with the below flags
+-      ADD_COMPILE_FLAG("-march=native")
++      #ADD_COMPILE_FLAG("-march=native")
+     endif ()
+   endif ()
+   ADD_COMPILE_FLAG("-Wall")
diff -Nru rustc-1.25.0+dfsg1/debian/patches/series rustc-1.25.0+dfsg1/debian/patches/series
--- rustc-1.25.0+dfsg1/debian/patches/series	2018-05-18 09:06:33.000000000 +0000
+++ rustc-1.25.0+dfsg1/debian/patches/series	2018-06-20 22:12:21.000000000 +0000
@@ -35,3 +35,4 @@
 
 # Work around for some porterboxes, keep this commented
 #d-host-duplicates.patch
+remove--march=native-from-srcbinaryencma.patch
diff -Nru rustc-1.25.0+dfsg1/debian/rules rustc-1.25.0+dfsg1/debian/rules
--- rustc-1.25.0+dfsg1/debian/rules	2018-05-19 18:46:51.000000000 +0000
+++ rustc-1.25.0+dfsg1/debian/rules	2018-06-20 22:12:21.000000000 +0000
@@ -238,7 +238,7 @@
 		test "$$(stat -c %s "$$x")" -lt 6000000; \
 	done
 ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
-ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS) | tee $(TEST_LOG)
 	test -f $(TEST_LOG)
 	echo "Summary of specific test failures:"; \