OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alex Crichton 2017-03-10 16:51:23 -06:00
parent 5c715dee38 0a55c8e659
commit 0ce745bc30
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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"
;; ;;

2
src/bootstrap/bootstrap.py
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':