Merge tag '1.40.0+dfsg1-5' into bullseye-working

Conflicts:
	debian/architecture.mk
	debian/changelog
	debian/rules

diff --cc debian/architecture.mk
index 9cc517e77e03b01ea63f735aa371644d6535b041,dd027a13eb085dea1596ac9837cf31a72804a928..922435459423bf3cc9d8a8542cb98ba8578716f9
--- 1/debian/architecture.mk
--- 2/debian/architecture.mk
+++ b/debian/architecture.mk
@@@ -2,7 -2,11 +2,8 @@@
  
  include /usr/share/dpkg/architecture.mk
  
- rust_cpu = $(subst i586,i686,$(1))
+ rust_cpu = $(subst i586,i686,\
 -$(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),\
 -$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\
 -$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\
 -$(1)))))
++$(if $(findstring -riscv64-,-$(2)-),$(subst riscv64,riscv64gc,$(1)),$(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 --cc debian/changelog
index d0e321ce7b71fd5c6b9b9e807ea9d8744a44dba0,ac1fdce3e5b33ef1d4a4396d465dc18d120f0676..5758815980a6ddeb23475520684f59fab0c520ae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,30 +1,41 @@@
- rustc (1.40.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++rustc (1.40.0+dfsg1-5+rpi1) bullseye-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.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Jan 2020 02:01:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Jan 2020 11:16:08 +0000
++
+ rustc (1.40.0+dfsg1-5) unstable; urgency=medium
+ 
+   * More python 2 -> 3 fixes.
+   * Allow 24 failing tests on riscv64.
+   * Reenable debuginfo for rustc, not just libstd.
+   * Reenable backtraces during tests.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 05 Jan 2020 13:35:46 +0000
+ 
+ rustc (1.40.0+dfsg1-4) unstable; urgency=medium
+ 
+   * Experimental riscv64 support.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 04 Jan 2020 05:40:11 +0000
+ 
+ rustc (1.40.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Work around upstream #59264 again. :/
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 03 Jan 2020 22:05:16 +0000
+ 
+ rustc (1.40.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Fix more internal build scripts so they use python3.
+   * Don't add -L/usr/lib/llvm when cross-compiling. (Closes: #941783)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 03 Jan 2020 20:18:46 +0000
  
  rustc (1.40.0+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
index 8cbaaab2ff6a5101ce16ce864bd7a83d5e411fe4,bc73c589645626b789989e016894be54e7f3eb37..d9ffe2f5cca6a68e8517750dfbf5785287122875
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -238,8 -240,8 +240,8 @@@ override_dh_auto_test-arch
                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); echo $$?; } | tee -a $(TEST_LOG)
+       { $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
        # test that the log has at least 1 pass, to prevent e.g. #57709
        grep -l "^test .* \.\.\. ok$$" $(TEST_LOG)
        echo "==== Debian rustc test report ===="; \