Prepare for 0.5.10 which exports features to 0.6.0 #143
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @thejpster (rust_highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
S-waiting-on-review
|
bors try |
tryBuild succeeded |
|
Released 🎉 |
adamgreig
pushed a commit
that referenced
this pull request
Jan 12, 2022
143: `b UserHardFault` r=adamgreig a=japaric
this commit replaces the `bl UserHardFault` instruction in HardFault with `b
UserHardFault`. This lets us drop the prologue (`push {r0,lr}`) while preserving
the ability to unwind the stack using GDB.
To prevent linker errors about relocations when UserHardFault and HardFault end
up far away from each other and the target is ARMv6-M (where the `b` instruction
only supports offsets of +/- 2KB) we use two *input* sections: .HardFault and
.UserHardFault. HardFault is placed in the .HardFault section and UserHardFault
is placed in the .UserHardFault section. The .HardFault input section is placed
in the output .text section after all the input .text sections, and the
.UserHardFault input section is placed after the .HardFault section. This
causes the two symbols to always appear next to each other in the output binary,
furthermore UserHardFault *always* appears after HardFault so the branch offset
of `b UserHardFault` is always a few bytes.
It should be noted that neither .HardFault or .UserHardFault will appear in the
output of the `size -A` command as they are input sections that get merged into
the output .text section. IOW, the sizes of HardFault and UserHardFault will
continue to be reported under the .text section.
cc @adamgreen
Co-authored-by: Jorge Aparicio <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@japaric noticed that 0.5.9 does not set its own features on its dependency on cortex-m 0.6.0, which means for example enabling
inline-asmon 0.5.9 would not cause inline assembly to be generated, because 0.5.9 re-exports 0.6.0'sasmmodule, which wouldn't necessarily have had the feature enabled.This PR updates 0.5.10's Cargo.toml to re-export those features too.
I've tested this continues to work as before (in fact you can successfully build an application using 0.5.9 and 0.5.10 and 0.6.0), and also tested that inline asm generation is working correctly (when the application depends on 0.5.10 with inline-asm feature, calls to cortex_m::asm result in inline asm).