Rollup merge of #40261 - infinity0:patch-1, r=alexcrichton

Support armhf abi on 64-bit ARM cpus

They report their `uname -m` as armv8l rather than aarch64.

Patch originally by Matthias Klose <doko@debian.org>

diff --git a/configure b/configure
index be8628de62832f0b01b8ca60b0c8a97696850c9a..d8861dacafac1091c3deb54ab211f54bc3d4e058 100755 (executable)
--- a/configure
+++ b/configure
@@ -512,7 +512,7 @@ case $CFG_CPUTYPE in
         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
         ;;
 
-    armv7l)
+    armv7l | armv8l)
         CFG_CPUTYPE=armv7
         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
         ;;

diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 7dd53f41a214adb838a281bdef446e56590931be..4f41d337592b302ffe629ed192e0126d2fb3b383 100644 (file)
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -465,7 +465,7 @@ class RustBuild(object):
             cputype = 'i686'
         elif cputype in {'xscale', 'arm'}:
             cputype = 'arm'
-        elif cputype == 'armv7l':
+        elif cputype in {'armv7l', 'armv8l'}:
             cputype = 'arm'
             ostype += 'eabihf'
         elif cputype == 'aarch64':