From 965a97093e727ddbbc12a99bf4b431b7843a841c Mon Sep 17 00:00:00 2001 From: eV Date: Sat, 13 Oct 2018 03:16:09 +0000 Subject: [PATCH 1/3] targets: thumbv8m: Add target for baseline ARMv8-M --- src/librustc_target/spec/mod.rs | 1 + src/librustc_target/spec/thumb_base.rs | 5 +-- .../spec/thumbv8m_none_eabi.rs | 33 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 src/librustc_target/spec/thumbv8m_none_eabi.rs diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 3f1e8ee55286b..e7ea4a3d20703 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -397,6 +397,7 @@ supported_targets! { ("thumbv7m-none-eabi", thumbv7m_none_eabi), ("thumbv7em-none-eabi", thumbv7em_none_eabi), ("thumbv7em-none-eabihf", thumbv7em_none_eabihf), + ("thumbv8m-none-eabi", thumbv8m_none_eabi), ("msp430-none-elf", msp430_none_elf), diff --git a/src/librustc_target/spec/thumb_base.rs b/src/librustc_target/spec/thumb_base.rs index 4c9a4764eff40..795a1fbcf98dd 100644 --- a/src/librustc_target/spec/thumb_base.rs +++ b/src/librustc_target/spec/thumb_base.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// These 4 `thumbv*` targets cover the ARM Cortex-M family of processors which are widely used in +// These `thumbv*` targets cover the ARM Cortex-M family of processors which are widely used in // microcontrollers. Namely, all these processors: // // - Cortex-M0 @@ -17,8 +17,9 @@ // - Cortex-M3 // - Cortex-M4(F) // - Cortex-M7(F) +// - Cortex-M23 // -// We have opted for 4 targets instead of one target per processor (e.g. `cortex-m0`, `cortex-m3`, +// We have opted for these targets instead of one target per processor (e.g. `cortex-m0`, `cortex-m3`, // etc) because the differences between some processors like the cortex-m0 and cortex-m1 are almost // non-existent from the POV of codegen so it doesn't make sense to have separate targets for them. // And if differences exist between two processors under the same target, rustc flags can be used to diff --git a/src/librustc_target/spec/thumbv8m_none_eabi.rs b/src/librustc_target/spec/thumbv8m_none_eabi.rs new file mode 100644 index 0000000000000..a0adeef2e0474 --- /dev/null +++ b/src/librustc_target/spec/thumbv8m_none_eabi.rs @@ -0,0 +1,33 @@ +// Copyright 2018 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Targets the Cortex-M23 processor (Baseline ARMv8-M) + +use spec::{LinkerFlavor, LldFlavor, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + Ok(Target { + llvm_target: "thumbv8m.base-none-eabi".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "32".to_string(), + target_c_int_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: String::new(), + target_vendor: String::new(), + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), + + options: TargetOptions { + max_atomic_width: Some(32), + .. super::thumb_base::opts() + }, + }) +} From 0e131052f6ba7765249c7401406b504899994b7b Mon Sep 17 00:00:00 2001 From: eV Date: Sat, 13 Oct 2018 15:52:40 +0000 Subject: [PATCH 2/3] fix tidy --- src/librustc_target/spec/thumb_base.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_target/spec/thumb_base.rs b/src/librustc_target/spec/thumb_base.rs index 795a1fbcf98dd..22e5f49fd5980 100644 --- a/src/librustc_target/spec/thumb_base.rs +++ b/src/librustc_target/spec/thumb_base.rs @@ -19,7 +19,7 @@ // - Cortex-M7(F) // - Cortex-M23 // -// We have opted for these targets instead of one target per processor (e.g. `cortex-m0`, `cortex-m3`, +// We have opted for these instead of one target per processor (e.g. `cortex-m0`, `cortex-m3`, // etc) because the differences between some processors like the cortex-m0 and cortex-m1 are almost // non-existent from the POV of codegen so it doesn't make sense to have separate targets for them. // And if differences exist between two processors under the same target, rustc flags can be used to From 8a0666d5cc2def02e64b1090efc494d81a0b8dd1 Mon Sep 17 00:00:00 2001 From: eV Date: Fri, 19 Oct 2018 04:51:02 +0000 Subject: [PATCH 3/3] rename to thumbv8m.base-none-eabi, fix strict alignment --- src/librustc_target/spec/mod.rs | 2 +- .../spec/{thumbv8m_none_eabi.rs => thumbv8m_base_none_eabi.rs} | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) rename src/librustc_target/spec/{thumbv8m_none_eabi.rs => thumbv8m_base_none_eabi.rs} (87%) diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index e7ea4a3d20703..7c8409becc13a 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -397,7 +397,7 @@ supported_targets! { ("thumbv7m-none-eabi", thumbv7m_none_eabi), ("thumbv7em-none-eabi", thumbv7em_none_eabi), ("thumbv7em-none-eabihf", thumbv7em_none_eabihf), - ("thumbv8m-none-eabi", thumbv8m_none_eabi), + ("thumbv8m.base-none-eabi", thumbv8m_base_none_eabi), ("msp430-none-elf", msp430_none_elf), diff --git a/src/librustc_target/spec/thumbv8m_none_eabi.rs b/src/librustc_target/spec/thumbv8m_base_none_eabi.rs similarity index 87% rename from src/librustc_target/spec/thumbv8m_none_eabi.rs rename to src/librustc_target/spec/thumbv8m_base_none_eabi.rs index a0adeef2e0474..b614371156365 100644 --- a/src/librustc_target/spec/thumbv8m_none_eabi.rs +++ b/src/librustc_target/spec/thumbv8m_base_none_eabi.rs @@ -26,6 +26,9 @@ pub fn target() -> TargetResult { linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), options: TargetOptions { + // ARMv8-M baseline doesn't support unaligned loads/stores so we disable them + // with +strict-align. + features: "+strict-align".to_string(), max_atomic_width: Some(32), .. super::thumb_base::opts() },