From 0a55c8e659f0fc540b740101f7a02ab28e300aa4 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Mon, 6 Mar 2017 21:42:55 +0100 Subject: [PATCH] Support armhf abi on 64-bit ARM cpus They report their `uname -m` as armv8l rather than aarch64. Patch originally by Matthias Klose --- configure | 2 +- src/bootstrap/bootstrap.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index be8628de628..d8861dacafa 100755 --- 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 7dd53f41a21..4f41d337592 100644 --- 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': -- 2.44.0