Skip to content

Commit 715f1e8

Browse files
authored
Rollup merge of #72133 - bdbai:master, r=joshtriplett
Add target thumbv7a-uwp-windows-msvc Add target spec for thumbv7a-uwp-windows-msvc, so that libraries written in Rust will have a chance to run on ARM-based devices with Windows 10. So far I managed to create a proof-of-concept library for Universal Windows Platform apps to consume and it worked on a Windows Phone. However, building a standalone executable seemed troublesome due to `LLVM ERROR: target does not implement codeview register mapping` stuff (see also #52659 (comment) ). Steps to test: 1. Clone and build this version ```sh git clone https://github.com/bdbai/rust.git cd rust python x.py build -i --target thumbv7a-uwp-windows-msvc --stage 1 src/libstd rustup toolchain link arm-uwp-stage1 .\build\x86_64-pc-windows-msvc\stage1\ ``` 2. Create a new library crate ```sh cargo new --lib arm-uwp-test cd arm-uwp-test ``` 3. Change `crate-type` in `Cargo.toml` to `staticlib` ```toml [lib] crate-type=["staticlib"] ``` 4. Replace the following code in `src/lib.rs` ```rust #[no_mangle] pub extern "system" fn call_rust() -> i32 { 2333 } ``` 5. Build the crate ```sh cargo +arm-uwp-stage1 build -v --target thumbv7a-uwp-windows-msvc ``` 6. `arm-uwp-test.lib` should appear in `target\thumbv7a-uwp-windows-msvc\debug` To consume this library: 1. Make sure Visual Studio 2017 and Windows 10 SDK (10.0.17134 or above) are installed 2. Create a new Blank App (C++/WinRT) in Visual Studio 2017 (Visual Studio 2019 cannot deploy UWP apps to Windows Phone) 3. Go to Property Pages, and then Linker->Input->Additional Dependencies, add `arm-uwp-test.lib` produced just now 4. Manually declare function prototypes in `MainPage.h` ```c++ extern "C" { int call_rust(); } ``` 5. Replace the `ClickHandler` part in `MainPage.cpp` ```c++ myButton().Content(box_value(std::to_wstring(call_rust()))); ``` 6. Build and deploy this app to an ARM device running Windows 10. The app should run and show `2333` when the button is clicked.
2 parents ee0c7d4 + 5bfb7e7 commit 715f1e8

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

src/librustc_codegen_ssa/back/link.rs

+1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ fn get_linker(sess: &Session, linker: &Path, flavor: LinkerFlavor) -> Command {
183183
"x86_64" => Some("x64".to_string()),
184184
"x86" => Some("x86".to_string()),
185185
"aarch64" => Some("arm64".to_string()),
186+
"arm" => Some("arm".to_string()),
186187
_ => None,
187188
};
188189
if let Some(ref a) = arch {

src/librustc_target/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ supported_targets! {
618618
("i686-uwp-windows-msvc", i686_uwp_windows_msvc),
619619
("i586-pc-windows-msvc", i586_pc_windows_msvc),
620620
("thumbv7a-pc-windows-msvc", thumbv7a_pc_windows_msvc),
621+
("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),
621622

622623
("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
623624
("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
use crate::spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
2+
3+
pub fn target() -> TargetResult {
4+
let mut base = super::windows_uwp_msvc_base::opts();
5+
base.max_atomic_width = Some(64);
6+
base.has_elf_tls = true;
7+
8+
// FIXME(jordanrh): use PanicStrategy::Unwind when SEH is
9+
// implemented for windows/arm in LLVM
10+
base.panic_strategy = PanicStrategy::Abort;
11+
12+
Ok(Target {
13+
llvm_target: "thumbv7a-pc-windows-msvc".to_string(),
14+
target_endian: "little".to_string(),
15+
target_pointer_width: "32".to_string(),
16+
target_c_int_width: "32".to_string(),
17+
data_layout: "e-m:w-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
18+
arch: "arm".to_string(),
19+
target_os: "windows".to_string(),
20+
target_env: "msvc".to_string(),
21+
target_vendor: "uwp".to_string(),
22+
linker_flavor: LinkerFlavor::Msvc,
23+
options: TargetOptions {
24+
features: "+vfp3,+neon".to_string(),
25+
cpu: "generic".to_string(),
26+
abi_blacklist: super::arm_base::abi_blacklist(),
27+
..base
28+
},
29+
})
30+
}

0 commit comments

Comments
 (0)