Skip to content

Swap to just-stabilised asm!() and global_asm!() macros #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 1, 2022
Merged

Swap to just-stabilised asm!() and global_asm!() macros #423

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
689259b
Exclude c-m-rt from cron test of cortex-m, fixes #417
adamgreig Jan 29, 2022
9e8dd29
Allow #[naked] attribute on interrupt handlers and pre_init
adamgreig Feb 3, 2022
894f2aa
Remove outlined asm, replace with stable inline asm.
adamgreig Feb 21, 2022
2810f97
Remove prebuilt cortex-m-rt binaries, replace with global_asm
adamgreig Feb 22, 2022
7813e4d
Add set-sp and set-vtor features to cortex-m-rt.
adamgreig Feb 22, 2022
37de64a
Remove references to unsupported Rust versions in cortex-m-rt
adamgreig Feb 24, 2022
c39dfb3
Bump to Edition 2021 and rust-version 1.59
adamgreig Feb 24, 2022
db8bea2
Add a free() method for non-cortex-m build targets that panics, to al…
adamgreig Feb 24, 2022
f2feeb2
Tweaks to enable building and doctesting on host platform
adamgreig Feb 24, 2022
3e8a5be
Fix cortex-m-rt qemu test by removing 'nomem' from semihosting_syscal…
adamgreig Feb 25, 2022
b49bcbe
Remove inline-asm features from cortex-m-semihosting and panic-semiho…
adamgreig Feb 25, 2022
ac2a836
Put inline asm directly into cortex-m-semihosting so it doesn't need …
adamgreig Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ delete_merged_branches = true
required_approvals = 1
status = [
"ci-linux (stable)",
"ci-linux (1.42.0)",
"ci-linux (1.59.0)",
"rt-ci-linux (stable)",
"rt-ci-linux (1.42.0)",
"rt-ci-linux (1.59.0)",
"rt-ci-other-os (macOS-latest)",
"rt-ci-other-os (windows-latest)",
"rustfmt",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

include:
# Test MSRV
- rust: 1.42.0
- rust: 1.59.0

# Test nightly but don't fail
- rust: nightly
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
toolchain: stable
override: true
- name: Run tests
run: cargo test --all
run: cargo test --all --exclude cortex-m-rt
- uses: imjohnbo/issue-bot@v2
if: failure()
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/rt-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
continue-on-error: ${{ matrix.experimental || false }}
strategy:
matrix:
# All generated code should be running on stable now
rust: [nightly, stable, 1.42.0]
rust: [nightly, stable, 1.59.0]

include:
# Nightly is only for reference and allowed to fail
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- Fixed `singleton!()` statics sometimes ending up in `.data` instead of `.bss` (#364, #380).

### Changed
- Inline assembly is now always used, requiring Rust 1.59.

### Removed
- removed all peripherals `ptr()` functions in favor of the associated constant `PTR` (#385).
- removed `inline-asm` feature which is now always enabled

## [v0.7.4] - 2021-12-31

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ name = "cortex-m"
readme = "README.md"
repository = "https://github.com/rust-embedded/cortex-m"
version = "0.7.4"
edition = "2018"
edition = "2021"
rust-version = "1.59"
links = "cortex-m" # prevent multiple versions of this crate to be linked together

[dependencies]
Expand All @@ -29,7 +30,6 @@ optional = true
[features]
cm7 = []
cm7-r0p1 = ["cm7"]
inline-asm = []
linker-plugin-lto = []
std = []

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.42 and up. It might compile with older versions but that may change in any new patch release.
This crate is guaranteed to compile on stable Rust 1.59 and up. It might compile with older versions but that may change in any new patch release.

## License

Expand Down
1 change: 0 additions & 1 deletion asm-toolchain
View file
Open in desktop

This file was deleted.

Loading