add Thumbs to the compiler
this commit adds 4 new target definitions to the compiler for easier
cross compilation to ARM Cortex-M devices.
- `thumbv6m-none-eabi`
- For the Cortex-M0, Cortex-M0+ and Cortex-M1
- This architecture doesn't have hardware support (instructions) for
atomics. Hence, the `Atomic*` structs are not available for this
target.
- `thumbv7m-none-eabi`
- For the Cortex-M3
- `thumbv7em-none-eabi`
- For the FPU-less variants of the Cortex-M4 and Cortex-M7
- On this target, all the floating point operations will be lowered
software routines (intrinsics)
- `thumbv7em-none-eabihf`
- For the variants of the Cortex-M4 and Cortex-M7 that do have a FPU.
- On this target, all the floating point operations will be lowered
to hardware instructions
No binary releases of standard crates, like `core`, are planned for
these targets because Cargo, in the future, will compile e.g. the `core`
crate on the fly as part of the `cargo build` process. In the meantime,
you'll have to compile the `core` crate yourself. [Xargo] is the easiest
way to do that as in handles the compilation of `core` automatically and
can be used just like Cargo: `xargo build --target thumbv6m-none-eabi`
is all that's needed.
[Xargo]: https://crates.io/crates/xargo
This commit is contained in:
parent
8991ffc303
commit
901c5f2aa4
7 changed files with 163 additions and 2 deletions
|
|
@ -66,11 +66,12 @@ mod netbsd_base;
|
|||
mod solaris_base;
|
||||
mod windows_base;
|
||||
mod windows_msvc_base;
|
||||
mod thumb_base;
|
||||
|
||||
pub type TargetResult = Result<Target, String>;
|
||||
|
||||
macro_rules! supported_targets {
|
||||
( $(($triple:expr, $module:ident)),+ ) => (
|
||||
( $(($triple:expr, $module:ident),)+ ) => (
|
||||
$(mod $module;)*
|
||||
|
||||
/// List of supported targets
|
||||
|
|
@ -191,7 +192,12 @@ supported_targets! {
|
|||
|
||||
("le32-unknown-nacl", le32_unknown_nacl),
|
||||
("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
|
||||
("wasm32-unknown-emscripten", wasm32_unknown_emscripten)
|
||||
("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
|
||||
|
||||
("thumbv6m-none-eabi", thumbv6m_none_eabi),
|
||||
("thumbv7m-none-eabi", thumbv7m_none_eabi),
|
||||
("thumbv7em-none-eabi", thumbv7em_none_eabi),
|
||||
("thumbv7em-none-eabihf", thumbv7em_none_eabihf),
|
||||
}
|
||||
|
||||
/// Everything `rustc` knows about how to compile for a specific target.
|
||||
|
|
@ -401,6 +407,9 @@ impl Default for TargetOptions {
|
|||
allow_asm: true,
|
||||
has_elf_tls: false,
|
||||
obj_is_bitcode: false,
|
||||
// NOTE 0 is *not* the real default value of max_atomic_width. The default value is
|
||||
// actually the pointer_width of the target. This default is injected in the
|
||||
// Target::from_json function.
|
||||
max_atomic_width: 0,
|
||||
panic_strategy: PanicStrategy::Unwind,
|
||||
}
|
||||
|
|
@ -699,6 +708,10 @@ impl ToJson for Target {
|
|||
target_option_val!(max_atomic_width);
|
||||
target_option_val!(panic_strategy);
|
||||
|
||||
if self.options.max_atomic_width.to_string() != self.target_pointer_width {
|
||||
d.insert("max-atomic-width".to_string(), self.options.max_atomic_width.to_json());
|
||||
}
|
||||
|
||||
Json::Object(d)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
20
src/librustc_back/target/thumb_base.rs
Normal file
20
src/librustc_back/target/thumb_base.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use target::TargetOptions;
|
||||
use std::default::Default;
|
||||
|
||||
pub fn opts() -> TargetOptions {
|
||||
TargetOptions {
|
||||
executables: true,
|
||||
linker: "arm-none-eabi-gcc".to_string(),
|
||||
.. Default::default()
|
||||
}
|
||||
}
|
||||
34
src/librustc_back/target/thumbv6m_none_eabi.rs
Normal file
34
src/librustc_back/target/thumbv6m_none_eabi.rs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use target::{Target, TargetOptions, TargetResult};
|
||||
|
||||
pub fn target() -> TargetResult {
|
||||
Ok(Target {
|
||||
llvm_target: "thumbv6m-none-eabi".to_string(),
|
||||
target_endian: "little".to_string(),
|
||||
target_pointer_width: "32".to_string(),
|
||||
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
|
||||
arch: "arm".to_string(),
|
||||
target_os: "none".to_string(),
|
||||
target_env: "".to_string(),
|
||||
target_vendor: "".to_string(),
|
||||
|
||||
options: TargetOptions {
|
||||
// The ARMv6-M architecture doesn't support unaligned loads/stores so we disable them
|
||||
// with +strict-align.
|
||||
features: "+strict-align".to_string(),
|
||||
// There are no atomic instructions available in the instruction set of the ARMv6-M
|
||||
// architecture
|
||||
max_atomic_width: 0,
|
||||
.. super::thumb_base::opts()
|
||||
}
|
||||
})
|
||||
}
|
||||
29
src/librustc_back/target/thumbv7em_none_eabi.rs
Normal file
29
src/librustc_back/target/thumbv7em_none_eabi.rs
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use target::{Target, TargetOptions, TargetResult};
|
||||
|
||||
pub fn target() -> TargetResult {
|
||||
Ok(Target {
|
||||
llvm_target: "thumbv7em-none-eabi".to_string(),
|
||||
target_endian: "little".to_string(),
|
||||
target_pointer_width: "32".to_string(),
|
||||
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
|
||||
arch: "arm".to_string(),
|
||||
target_os: "none".to_string(),
|
||||
target_env: "".to_string(),
|
||||
target_vendor: "".to_string(),
|
||||
|
||||
options: TargetOptions {
|
||||
max_atomic_width: 32,
|
||||
.. super::thumb_base::opts()
|
||||
},
|
||||
})
|
||||
}
|
||||
31
src/librustc_back/target/thumbv7em_none_eabihf.rs
Normal file
31
src/librustc_back/target/thumbv7em_none_eabihf.rs
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use target::{Target, TargetOptions, TargetResult};
|
||||
|
||||
pub fn target() -> TargetResult {
|
||||
Ok(Target {
|
||||
llvm_target: "thumbv7em-none-eabihf".to_string(),
|
||||
target_endian: "little".to_string(),
|
||||
target_pointer_width: "32".to_string(),
|
||||
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
|
||||
arch: "arm".to_string(),
|
||||
target_os: "none".to_string(),
|
||||
target_env: "".to_string(),
|
||||
target_vendor: "".to_string(),
|
||||
|
||||
options: TargetOptions {
|
||||
// vfp4 lowest common denominator between the Cortex-M4 (vfp4) and the Cortex-M7 (vfp5)
|
||||
features: "+vfp4".to_string(),
|
||||
max_atomic_width: 32,
|
||||
.. super::thumb_base::opts()
|
||||
}
|
||||
})
|
||||
}
|
||||
29
src/librustc_back/target/thumbv7m_none_eabi.rs
Normal file
29
src/librustc_back/target/thumbv7m_none_eabi.rs
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
use target::{Target, TargetOptions, TargetResult};
|
||||
|
||||
pub fn target() -> TargetResult {
|
||||
Ok(Target {
|
||||
llvm_target: "thumbv7m-none-eabi".to_string(),
|
||||
target_endian: "little".to_string(),
|
||||
target_pointer_width: "32".to_string(),
|
||||
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
|
||||
arch: "arm".to_string(),
|
||||
target_os: "none".to_string(),
|
||||
target_env: "".to_string(),
|
||||
target_vendor: "".to_string(),
|
||||
|
||||
options: TargetOptions {
|
||||
max_atomic_width: 32,
|
||||
.. super::thumb_base::opts()
|
||||
},
|
||||
})
|
||||
}
|
||||
5
src/test/run-make/target-without-atomics/Makefile
Normal file
5
src/test/run-make/target-without-atomics/Makefile
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
-include ../tools.mk
|
||||
|
||||
# The target used below doesn't support atomic operations. Verify that's the case
|
||||
all:
|
||||
rustc --print cfg --target thumbv6m-none-eabi | grep -qv target_has_atomic
|
||||
Loading…
Add table
Add a link
Reference in a new issue