Skip to content

Assume ARMv6 when <cpu> section is missing #143

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.

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 2 commits into from
Sep 20, 2017
Merged

Assume ARMv6 when <cpu> section is missing #143

merged 2 commits into from
Sep 20, 2017

Conversation

jonas-schievink
Copy link
Contributor

This makes the generated crates build in more cases.

This makes the generated crates build in more cases
src/generate.rs Outdated
@@ -244,7 +244,8 @@ pub fn interrupt(
Target::CortexM => {
let is_armv6 = match device.cpu {
Some(ref cpu) if cpu.name.starts_with("CM0") => true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could the first two arms be merged into Some(ref cpu) => cpu.starts_with("CM0")?

And I think it would be better (for readability) to explicitly write None in the third arm.

@japaric
Copy link
Member

japaric commented Sep 19, 2017

@homunkulus delegate+

@jonas-schievink you can r+ this PR once you do the change (if it makes sense to change it) if I'm not around by then.

@homunkulus
Copy link
Contributor

✌️ @jonas-schievink can now approve this pull request

@jonas-schievink
Copy link
Contributor Author

Done!

@homunkulus r+

@homunkulus
Copy link
Contributor

📌 Commit 8b3b278 has been approved by jonas-schievink

@homunkulus
Copy link
Contributor

⌛ Testing commit 8b3b278 with merge ed9ba7f...

japaric pushed a commit that referenced this pull request Sep 20, 2017
Assume ARMv6 when `<cpu>` section is missing

This makes the generated crates build in more cases.
@homunkulus
Copy link
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: jonas-schievink
Pushing ed9ba7f to master...

@homunkulus homunkulus merged commit 8b3b278 into rust-embedded:master Sep 20, 2017
@jonas-schievink jonas-schievink deleted the armv6default branch September 20, 2017 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants