From bc824d90cfdedc30e497cd4e8708fd0fe5a0f5b7 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Wed, 5 Apr 2017 10:50:36 -0300 Subject: [PATCH] Add armv8l support --- rustup-init.sh | 2 +- src/rustup-dist/src/dist.rs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rustup-init.sh b/rustup-init.sh index 2c46f38077..7cf22f3b36 100755 --- a/rustup-init.sh +++ b/rustup-init.sh @@ -244,7 +244,7 @@ get_architecture() { fi ;; - armv7l) + armv7l | armv8l) local _cputype=armv7 if [ "$_ostype" == "linux-android" ]; then local _ostype=linux-androideabi diff --git a/src/rustup-dist/src/dist.rs b/src/rustup-dist/src/dist.rs index fa4f515b3b..b7fde7d4ef 100644 --- a/src/rustup-dist/src/dist.rs +++ b/src/rustup-dist/src/dist.rs @@ -163,6 +163,7 @@ impl TargetTriple { let host_triple = match (sysname, machine) { (_, b"arm") if cfg!(target_os = "android") => Some("arm-linux-androideabi"), (_, b"armv7l") if cfg!(target_os = "android") => Some("armv7-linux-androideabi"), + (_, b"armv8l") if cfg!(target_os = "android") => Some("armv7-linux-androideabi"), (_, b"aarch64") if cfg!(target_os = "android") => Some("aarch64-linux-android"), (_, b"i686") if cfg!(target_os = "android") => Some("i686-linux-android"), (b"Linux", b"x86_64") => Some("x86_64-unknown-linux-gnu"), @@ -170,6 +171,8 @@ impl TargetTriple { (b"Linux", b"mips") => Some(TRIPLE_MIPS_UNKNOWN_LINUX_GNU), (b"Linux", b"mips64") => Some(TRIPLE_MIPS64_UNKNOWN_LINUX_GNUABI64), (b"Linux", b"arm") => Some("arm-unknown-linux-gnueabi"), + (b"Linux", b"armv7l") => Some("armv7-unknown-linux-gnueabihf"), + (b"Linux", b"armv8l") => Some("armv7-unknown-linux-gnueabihf"), (b"Linux", b"aarch64") => Some("aarch64-unknown-linux-gnu"), (b"Darwin", b"x86_64") => Some("x86_64-apple-darwin"), (b"Darwin", b"i686") => Some("i686-apple-darwin"),