Rollup merge of rust-lang#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 <[email protected]>
alexcrichton · Mar 11, 2017 · 0ce745b · 0ce745b
2 parents 5c715de + 0a55c8e
commit 0ce745b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -465,7 +465,7 @@ def build_triple(self):
             cputype = 'i686'
         elif cputype in {'xscale', 'arm'}:
             cputype = 'arm'
-        elif cputype == 'armv7l':
+        elif cputype in {'armv7l', 'armv8l'}:
             cputype = 'arm'
             ostype += 'eabihf'
         elif cputype == 'aarch64':