Auto merge of #1056 - malbarbo:armv8l, r=Diggsey

Add armv8l support Fixes #1055
rust-lang · Apr 19, 2017 · 7b3e8fb · 7b3e8fb
2 parents 8b3f637 + bc824d9
commit 7b3e8fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -163,13 +163,16 @@ 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"),
                 (b"Linux", b"i686") => Some("i686-unknown-linux-gnu"),
                 (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"),