Skip to content

Commit ebe6da3

Browse files
borsbors
committed
Auto merge of #33414 - Nercury:master, r=alexcrichton
Add armv7-linux-androideabi target This PR adds `armv7-linux-androideabi` target that matches `armeabi-v7a` Android ABI, ~~downscales `arm-linux-androideabi` target to match `armeabi` Android ABI~~ (TBD later if needed). This should allow us to get the best performance from every [Android ABI level](http://developer.android.com/ndk/guides/abis.html). Currently existing target `arm-linux-androideabi` started gaining features out of the supported range of [android `armeabi`](http://developer.android.com/ndk/guides/abis.html). While android compiler does not use a different target for later supported `armv7` architecture, it has distinct ABI name `armeabi-v7a`. We decided to add rust target `armv7-linux-androideabi` to match it. Note that `NEON`, `VFPv3-D32`, and `ThumbEE` instruction sets are not added, because not all android devices are guaranteed to support all or some of these, and [their availability should be checked at runtime](http://developer.android.com/ndk/guides/abis.html#v7a). ~~This reduces performance of existing `arm-linux-androideabi` and may make it _much_ slower (we are talking more than order of magnitude in some random ad-hoc fp benchmark that I did).~~ Part of #33278.
2 parents cae42a4 + ca03b81 commit ebe6da3

File tree

7 files changed

+77
-5
lines changed

7 files changed

+77
-5
lines changed

‎configure

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
632632
valopt android-cross-path "" "Android NDK standalone path (deprecated)"
633633
valopt i686-linux-android-ndk "" "i686-linux-android NDK standalone path"
634634
valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
635+
valopt armv7-linux-androideabi-ndk "" "armv7-linux-androideabi NDK standalone path"
635636
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
636637
valopt nacl-cross-path "" "NaCl SDK path (Pepper Canary is recommended). Must be absolute!"
637638
valopt release-channel "dev" "the name of the release channel to build"
@@ -1144,6 +1145,15 @@ do
11441145

11451146
case $i in
11461147
*android*)
1148+
case $i in
1149+
armv7-linux-androideabi)
1150+
cmd_prefix="arm-linux-androideabi"
1151+
;;
1152+
*)
1153+
cmd_prefix=$i
1154+
;;
1155+
esac
1156+
11471157
upper_snake_target=$(echo "$i" | tr '[:lower:]' '[:upper:]' | tr '\-' '\_')
11481158
eval ndk=\$"CFG_${upper_snake_target}_NDK"
11491159
if [ -z "$ndk" ]
@@ -1154,7 +1164,7 @@ do
11541164
fi
11551165

11561166
# Perform a basic sanity check of the NDK
1157-
for android_ndk_tool in "$ndk/bin/$i-gcc" "$ndk/bin/$i-g++" "$ndk/bin/$i-ar"
1167+
for android_ndk_tool in "$ndk/bin/$cmd_prefix-gcc" "$ndk/bin/$cmd_prefix-g++" "$ndk/bin/$cmd_prefix-ar"
11581168
do
11591169
if [ ! -f $android_ndk_tool ]
11601170
then
@@ -1786,6 +1796,7 @@ putvar CFG_LIBDIR_RELATIVE
17861796
putvar CFG_DISABLE_MANAGE_SUBMODULES
17871797
putvar CFG_AARCH64_LINUX_ANDROID_NDK
17881798
putvar CFG_ARM_LINUX_ANDROIDEABI_NDK
1799+
putvar CFG_ARMV7_LINUX_ANDROIDEABI_NDK
17891800
putvar CFG_I686_LINUX_ANDROID_NDK
17901801
putvar CFG_NACL_CROSS_PATH
17911802
putvar CFG_MANDIR

‎mk/cfg/armv7-linux-androideabi.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# armv7-linux-androideabi configuration
2+
CC_armv7-linux-androideabi=$(CFG_ARMV7_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-gcc
3+
CXX_armv7-linux-androideabi=$(CFG_ARMV7_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-g++
4+
CPP_armv7-linux-androideabi=$(CFG_ARMV7_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-gcc -E
5+
AR_armv7-linux-androideabi=$(CFG_ARMV7_LINUX_ANDROIDEABI_NDK)/bin/arm-linux-androideabi-ar
6+
CFG_LIB_NAME_armv7-linux-androideabi=lib$(1).so
7+
CFG_STATIC_LIB_NAME_armv7-linux-androideabi=lib$(1).a
8+
CFG_LIB_GLOB_armv7-linux-androideabi=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_armv7-linux-androideabi=lib$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_armv7-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_armv7-linux-androideabi := -Wall -g -fPIC -D__arm__ -mfloat-abi=softfp -march=armv7-a -mfpu=vfpv3-d16 -DANDROID -D__ANDROID__ $(CFLAGS)
12+
CFG_GCCISH_CXXFLAGS_armv7-linux-androideabi := -fno-rtti $(CXXFLAGS)
13+
CFG_GCCISH_LINK_FLAGS_armv7-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
14+
CFG_GCCISH_DEF_FLAG_armv7-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
15+
CFG_LLC_FLAGS_armv7-linux-androideabi :=
16+
CFG_INSTALL_NAME_armv7-linux-androideabi =
17+
CFG_EXE_SUFFIX_armv7-linux-androideabi :=
18+
CFG_WINDOWSY_armv7-linux-androideabi :=
19+
CFG_UNIXY_armv7-linux-androideabi := 1
20+
CFG_LDPATH_armv7-linux-androideabi :=
21+
CFG_RUN_armv7-linux-androideabi=
22+
CFG_RUN_TARG_armv7-linux-androideabi=
23+
RUSTC_FLAGS_armv7-linux-androideabi :=
24+
RUSTC_CROSS_FLAGS_armv7-linux-androideabi :=
25+
CFG_GNU_TRIPLE_armv7-linux-androideabi := arm-linux-androideabi

‎src/bootstrap/build/config.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,12 @@ impl Config {
338338
.or_insert(Target::default());
339339
target.ndk = Some(PathBuf::from(value));
340340
}
341+
"CFG_ARMV7_LINUX_ANDROIDEABI_NDK" if value.len() > 0 => {
342+
let target = "armv7-linux-androideabi".to_string();
343+
let target = self.target_config.entry(target)
344+
.or_insert(Target::default());
345+
target.ndk = Some(PathBuf::from(value));
346+
}
341347
"CFG_I686_LINUX_ANDROID_NDK" if value.len() > 0 => {
342348
let target = "i686-linux-androideabi".to_string();
343349
let target = self.target_config.entry(target)

‎src/doc/book/getting-started.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ unofficial locations.
9898
| Target | std |rustc|cargo| notes |
9999
|-------------------------------|-----|-----|-----|----------------------------|
100100
| `aarch64-linux-android` | ✓ | | | ARM64 Android |
101+
| `armv7-linux-androideabi` | ✓ | | | ARM-v7a Android |
101102
| `i686-linux-android` | ✓ | | | 32-bit x86 Android |
102103
| `i686-pc-windows-msvc` (XP) | ✓ | | | Windows XP support |
103104
| `i686-unknown-freebsd` | ✓ | ✓ | ✓ | 32-bit FreeBSD |

‎src/librustc_back/target/armv7_linux_androideabi.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::Target;
12+
13+
pub fn target() -> Target {
14+
let mut base = super::android_base::opts();
15+
base.features = "+v7,+thumb2,+vfp3,+d16".to_string();
16+
17+
Target {
18+
llvm_target: "armv7-none-linux-android".to_string(),
19+
target_endian: "little".to_string(),
20+
target_pointer_width: "32".to_string(),
21+
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
22+
arch: "arm".to_string(),
23+
target_os: "android".to_string(),
24+
target_env: "gnu".to_string(),
25+
target_vendor: "unknown".to_string(),
26+
options: base,
27+
}
28+
}

‎src/librustc_back/target/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ supported_targets! {
108108

109109
("i686-linux-android", i686_linux_android),
110110
("arm-linux-androideabi", arm_linux_androideabi),
111+
("armv7-linux-androideabi", armv7_linux_androideabi),
111112
("aarch64-linux-android", aarch64_linux_android),
112113

113114
("i686-unknown-freebsd", i686_unknown_freebsd),

‎src/tools/compiletest/src/runtest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use std::process::{Command, Output, ExitStatus};
3333
pub fn run(config: Config, testpaths: &TestPaths) {
3434
match &*config.target {
3535

36-
"arm-linux-androideabi" | "aarch64-linux-android" => {
36+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
3737
if !config.adb_device_status {
3838
panic!("android device not available");
3939
}
@@ -424,7 +424,7 @@ actual:\n\
424424

425425
let debugger_run_result;
426426
match &*self.config.target {
427-
"arm-linux-androideabi" | "aarch64-linux-android" => {
427+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
428428

429429
cmds = cmds.replace("run", "continue");
430430

@@ -1132,7 +1132,7 @@ actual:\n\
11321132

11331133
match &*self.config.target {
11341134

1135-
"arm-linux-androideabi" | "aarch64-linux-android" => {
1135+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
11361136
self._arm_exec_compiled_test(env)
11371137
}
11381138

@@ -1230,7 +1230,7 @@ actual:\n\
12301230
}
12311231

12321232
match &*self.config.target {
1233-
"arm-linux-androideabi" | "aarch64-linux-android" => {
1233+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
12341234
self._arm_push_aux_shared_library();
12351235
}
12361236
_ => {}

0 commit comments

Comments
 (0)