diff -Nru rustc-1.24.1+dfsg1/debian/architecture.mk rustc-1.24.1+dfsg1/debian/architecture.mk --- rustc-1.24.1+dfsg1/debian/architecture.mk 2018-03-03 11:23:04.000000000 +0000 +++ rustc-1.24.1+dfsg1/debian/architecture.mk 2018-08-16 11:45:45.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.24.1+dfsg1/debian/changelog rustc-1.24.1+dfsg1/debian/changelog --- rustc-1.24.1+dfsg1/debian/changelog 2018-07-08 19:39:35.000000000 +0000 +++ rustc-1.24.1+dfsg1/debian/changelog 2018-08-16 12:03:30.000000000 +0000 @@ -1,3 +1,14 @@ +rustc (1.24.1+dfsg1-1~deb9u2+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green 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 + + -- Peter Michael Green Thu, 16 Aug 2018 12:03:30 +0000 + rustc (1.24.1+dfsg1-1~deb9u2) stretch; urgency=medium * Add Build-Depends on rustc [!amd64] to prevent buildds from attempting diff -Nru rustc-1.24.1+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch rustc-1.24.1+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch --- rustc-1.24.1+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch 1970-01-01 00:00:00.000000000 +0000 +++ rustc-1.24.1+dfsg1/debian/patches/remove--march=native-from-srcbinaryencma.patch 2018-08-16 11:45:45.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +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.24.1+dfsg1/debian/patches/series rustc-1.24.1+dfsg1/debian/patches/series --- rustc-1.24.1+dfsg1/debian/patches/series 2018-03-05 15:21:31.000000000 +0000 +++ rustc-1.24.1+dfsg1/debian/patches/series 2018-08-16 11:45:45.000000000 +0000 @@ -41,3 +41,4 @@ # Work around for some porterboxes, keep this commented #d-host-duplicates.patch +remove--march=native-from-srcbinaryencma.patch diff -Nru rustc-1.24.1+dfsg1/debian/rules rustc-1.24.1+dfsg1/debian/rules --- rustc-1.24.1+dfsg1/debian/rules 2018-07-01 11:42:52.000000000 +0000 +++ rustc-1.24.1+dfsg1/debian/rules 2018-08-16 11:45:45.000000000 +0000 @@ -232,7 +232,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:"; \