Skip to content

Commit 7b3e8fb

Browse files
committed
Auto merge of #1056 - malbarbo:armv8l, r=Diggsey
Add armv8l support Fixes #1055
2 parents 8b3f637 + bc824d9 commit 7b3e8fb

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

rustup-init.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ get_architecture() {
244244
fi
245245
;;
246246

247-
armv7l)
247+
armv7l | armv8l)
248248
local _cputype=armv7
249249
if [ "$_ostype" = "linux-android" ]; then
250250
local _ostype=linux-androideabi

src/rustup-dist/src/dist.rs

+3
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,16 @@ impl TargetTriple {
163163
let host_triple = match (sysname, machine) {
164164
(_, b"arm") if cfg!(target_os = "android") => Some("arm-linux-androideabi"),
165165
(_, b"armv7l") if cfg!(target_os = "android") => Some("armv7-linux-androideabi"),
166+
(_, b"armv8l") if cfg!(target_os = "android") => Some("armv7-linux-androideabi"),
166167
(_, b"aarch64") if cfg!(target_os = "android") => Some("aarch64-linux-android"),
167168
(_, b"i686") if cfg!(target_os = "android") => Some("i686-linux-android"),
168169
(b"Linux", b"x86_64") => Some("x86_64-unknown-linux-gnu"),
169170
(b"Linux", b"i686") => Some("i686-unknown-linux-gnu"),
170171
(b"Linux", b"mips") => Some(TRIPLE_MIPS_UNKNOWN_LINUX_GNU),
171172
(b"Linux", b"mips64") => Some(TRIPLE_MIPS64_UNKNOWN_LINUX_GNUABI64),
172173
(b"Linux", b"arm") => Some("arm-unknown-linux-gnueabi"),
174+
(b"Linux", b"armv7l") => Some("armv7-unknown-linux-gnueabihf"),
175+
(b"Linux", b"armv8l") => Some("armv7-unknown-linux-gnueabihf"),
173176
(b"Linux", b"aarch64") => Some("aarch64-unknown-linux-gnu"),
174177
(b"Darwin", b"x86_64") => Some("x86_64-apple-darwin"),
175178
(b"Darwin", b"i686") => Some("i686-apple-darwin"),

0 commit comments

Comments
 (0)