diff -Nru rustc-1.21.0+dfsg1/debian/architecture.mk rustc-1.21.0+dfsg1/debian/architecture.mk
--- rustc-1.21.0+dfsg1/debian/architecture.mk	2017-04-05 14:31:40.000000000 +0000
+++ rustc-1.21.0+dfsg1/debian/architecture.mk	2017-11-02 12:14:56.000000000 +0000
@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-rust_cpu = $(subst i586,i686,$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(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.21.0+dfsg1/debian/changelog rustc-1.21.0+dfsg1/debian/changelog
--- rustc-1.21.0+dfsg1/debian/changelog	2017-11-06 09:03:32.000000000 +0000
+++ rustc-1.21.0+dfsg1/debian/changelog	2017-11-13 23:20:20.000000000 +0000
@@ -1,3 +1,13 @@
+rustc (1.21.0+dfsg1-3+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]
+  * Fix clean target.
+  * Build for armv6.
+  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 13 Nov 2017 23:20:20 +0000
+
 rustc (1.21.0+dfsg1-3) unstable; urgency=medium
 
   * Add/fix detection for sparc64, thanks to John Paul Adrian Glaubitz.
diff -Nru rustc-1.21.0+dfsg1/debian/rules rustc-1.21.0+dfsg1/debian/rules
--- rustc-1.21.0+dfsg1/debian/rules	2017-10-27 18:23:29.000000000 +0000
+++ rustc-1.21.0+dfsg1/debian/rules	2017-11-13 23:20:20.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:"; \
@@ -252,6 +252,7 @@
 	  echo "Check the logs further above for details."; \
 	  false; \
 	fi
+>>>>>>> debpsuedomerge
 # don't continue if RUSTBUILD_TEST_FLAGS is non-empty
 	test -z "$(RUSTBUILD_TEST_FLAGS)"
 endif