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>
This commit is contained in:
Ximin Luo 2017-03-06 21:42:55 +01:00 committed by Alex Crichton
parent f573db4f80
commit 0a55c8e659
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -512,7 +512,7 @@ case $CFG_CPUTYPE in
CFG_OSTYPE="${CFG_OSTYPE}eabihf" CFG_OSTYPE="${CFG_OSTYPE}eabihf"
;; ;;
armv7l) armv7l | armv8l)
CFG_CPUTYPE=armv7 CFG_CPUTYPE=armv7
CFG_OSTYPE="${CFG_OSTYPE}eabihf" CFG_OSTYPE="${CFG_OSTYPE}eabihf"
;; ;;

View File

@ -465,7 +465,7 @@ class RustBuild(object):
cputype = 'i686' cputype = 'i686'
elif cputype in {'xscale', 'arm'}: elif cputype in {'xscale', 'arm'}:
cputype = 'arm' cputype = 'arm'
elif cputype == 'armv7l': elif cputype in {'armv7l', 'armv8l'}:
cputype = 'arm' cputype = 'arm'
ostype += 'eabihf' ostype += 'eabihf'
elif cputype == 'aarch64': elif cputype == 'aarch64':