Skip to content

Commit 284b01b

Browse files
authored
Merge branch 'rust-embedded:master' into paint-stack
2 parents 7dc0b54 + b0d2e45 commit 284b01b

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/workflows/clippy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ on:
22
push:
33
branches-ignore:
44
- "gh-readonly-queue/**"
5-
pull_request_target:
5+
pull_request:
66
merge_group:
77
workflow_dispatch:
88

cortex-m-rt/link.x.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
static mut __sbss }`).
88

99
- `EXTERN` forces the linker to keep a symbol in the final binary. We use this to make sure a
10-
symbol if not dropped if it appears in or near the front of the linker arguments and "it's not
10+
symbol is not dropped if it appears in or near the front of the linker arguments and "it's not
1111
needed" by any of the preceding objects (linker arguments)
1212

1313
- `PROVIDE` is used to provide default values that can be overridden by a user linker script

testsuite/build.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
fn main() {
22
let target = std::env::var("TARGET").unwrap();
33

4+
println!("cargo:rustc-check-cfg=cfg(armv6m)");
5+
println!("cargo:rustc-check-cfg=cfg(armv7m)");
6+
println!("cargo:rustc-check-cfg=cfg(armv7em)");
7+
println!("cargo:rustc-check-cfg=cfg(armv8m)");
8+
println!("cargo:rustc-check-cfg=cfg(armv8m_base)");
9+
println!("cargo:rustc-check-cfg=cfg(armv8m_main)");
10+
411
if target.starts_with("thumbv6m-") {
512
println!("cargo:rustc-cfg=armv6m");
613
} else if target.starts_with("thumbv7m-") {

0 commit comments

Comments
 (0)