Skip to content

Enable AVR as a Tier 3 target upstream - #69478

Merged
bors merged 9 commits into
rust-lang:masterfrom
avr-rust:avr-support-upstream
Jun 12, 2020
Merged

Enable AVR as a Tier 3 target upstream#69478
bors merged 9 commits into
rust-lang:masterfrom
avr-rust:avr-support-upstream

Conversation

@dylanmckay

@dylanmckaydylanmckay commented Feb 26, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Tracking issue: #44052.

Things intentionally left out of the initial upstream:

  • The target_cpu flag

I have made the cleanup suggestions by @jplatte and @jplatte in avr-rust@043550d.

Anybody feel free to give the branch a test and see how it fares, or make suggestions on the code patch itself.

@rust-highfive

rust-highfive commented Feb 26, 2020

Copy link
Copy Markdown
Contributor

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2020
@dylanmckay

dylanmckay commented Feb 26, 2020

Copy link
Copy Markdown
ContributorAuthor

Dammit, meant to raise this on avr-rust/rust first, I always do this

@rust-highfive

This comment has been minimized.

Sign in to view
@dylanmckay

dylanmckay commented Feb 26, 2020

Copy link
Copy Markdown
ContributorAuthor

Actually, come to think of it, might as well keep it here for tracking.

Code reviews welcome, but let's hold off merging until some more testing has been done,

@dylanmckaydylanmckay reopened this Feb 26, 2020
@rust-highfive

This comment has been minimized.

Sign in to view
This was referenced Feb 26, 2020
Closed
Open
@dylanmckaydylanmckay changed the title Preliminary Pull Request: AVR support upstreamWIP: Enable AVR as a Tier 3 target upstreamFeb 26, 2020
@dylanmckay
dylanmckayforce-pushed the avr-support-upstream branch 2 times, most recently from 5d9b2ba to e3b36d7CompareFebruary 26, 2020 11:04
@rust-highfive

This comment has been minimized.

Sign in to view
shepmaster
shepmaster reviewed Feb 26, 2020
View reviewed changes
Comment threadsrc/librustc_target/spec/avr_unknown_unknown.rs Outdated
@shepmaster

shepmaster commented Feb 26, 2020

Copy link
Copy Markdown
Member

added some commits almost 4 years ago

How time flies!

@rust-highfive

This comment has been minimized.

Sign in to view
ecstatic-morse
ecstatic-morse reviewed Feb 26, 2020
View reviewed changes
Comment threadsrc/libcore/ptr/mod.rs Outdated
@dylanmckay
dylanmckayforce-pushed the avr-support-upstream branch 2 times, most recently from 9522529 to 37b32f0CompareMarch 3, 2020 06:38
@rust-highfive

This comment has been minimized.

Sign in to view
@dylanmckay

dylanmckay commented Mar 3, 2020

Copy link
Copy Markdown
ContributorAuthor

Any suggestions for where to put an AVR README or just AVR-specific documentation like build/usage instructions?

@dylanmckaydylanmckay mentioned this pull request Mar 3, 2020
Open
3 tasks
@rust-highfive

This comment has been minimized.

Sign in to view
@dylanmckay
dylanmckayforce-pushed the avr-support-upstream branch from 110ca92 to 99f6776CompareMarch 3, 2020 10:03
@dylanmckay

dylanmckay commented Mar 3, 2020

Copy link
Copy Markdown
ContributorAuthor

The only remaining failing automated test is related to name mangling, seems odd.

@rust-highfive

This comment has been minimized.

Sign in to view
@shepmaster

shepmaster commented Mar 3, 2020•
edited
Loading

Copy link
Copy Markdown
Member

We may need to re-bless the test output for the ABI failure tests (ui/feature-gates/feature-gate-abi-avr-interrupt.r)

@dylanmckay
[AVR] Re-bless the UI tests
e369cf6
Patch generated with `./x.py test --stage 1 src/test/ui/feature-gates --bless`.
@dylanmckay
[AVR] Update the compiletest library to recognize AVR as a 16-bit target
b4a041c
@dylanmckay
[AVR] Remove AVR-specific logic from libstd
8ba9cbd
It is not possible to compile libstd for AVR anyway.
@dylanmckay
[AVR] Rename the 'none_base' target spec module to 'freestanding_base'
1f0652f
@dylanmckay
[AVR] Update ABI type classification logic to match the the AVR-Clang…
0340359
… ABI
This patch brings the AVR calling convention argument classification
logic in line with AVR Clang's behaviour.
AVR-Clang currently uses the `clang::DefaultABIInfo` ABI implementation.
This calling convention promotes all aggregates to indirect, no matter their
size.
It is also unnecessary to perform any integer width extension for AVR as
the minimum argument size matches the minimum describable size of
abi::Primitive::Int - 8 bits.
At some point in the future, an AVR-GCC compatible argument
classification implementation should be adopted in both Clang and Rust.
@dylanmckay
dylanmckayforce-pushed the avr-support-upstream branch from 491bf8c to 0340359CompareJune 9, 2020 05:49
@dylanmckay

dylanmckay commented Jun 9, 2020

Copy link
Copy Markdown
ContributorAuthor

Rebased, and the calling convention re-blessing removed from the git history.

@jonas-schievink

jonas-schievink commented Jun 9, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 9, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0340359 has been approved by jonas-schievink

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 9, 2020
@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0340359 with merge 0b208d1125cca703f2f834db83a8a41988ffa813...

@Dylan-DPC-zz

Dylan-DPC-zz commented Jun 11, 2020

Copy link
Copy Markdown

@bors retry yield

@Dylan-DPC-zz

Dylan-DPC-zz commented Jun 12, 2020

Copy link
Copy Markdown

@bors p=1

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0340359 with merge e91bf6c...

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: jonas-schievink
Pushing e91bf6c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2020
@bors
bors merged commit e91bf6c into rust-lang:masterJun 12, 2020
This was referenced Jun 12, 2020
Merged
Merged
Merged
@flying-sheepflying-sheep mentioned this pull request Jun 12, 2020
Closed
41 tasks
@Restioson

Restioson commented Jun 12, 2020

Copy link
Copy Markdown

I have made the cleanup suggestions by @jplatte and @jplatte in avr-rust/rust-legacy-fork@043550d.

(from the original post)

Typo?

@shepmaster
shepmaster deleted the avr-support-upstream branch June 12, 2020 14:09
@jplatte

jplatte commented Jun 12, 2020

Copy link
Copy Markdown
Contributor

@Restioson the wording of that commit is a bit weird, but I did make two suggestions, so it was likely intentional. (not meant to mention somebody else, at least).

@yerkeyerke mentioned this pull request Jun 12, 2020
Merged
@Restioson

Restioson commented Jun 13, 2020

Copy link
Copy Markdown

Ah, okay.

dylanmckay added a commit to dylanmckay/rust that referenced this pull request Jun 19, 2020
@dylanmckay
[AVR] Re-bless the 'test/ui/symbol-names' tests
05e8729
Adding a new ABI changes the hashes of all previous ABIs.
Fix suggested by @shepmaster in
rust-lang#69478 (comment).
@mati865mati865 mentioned this pull request Sep 8, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shepmastershepmastershepmaster left review comments
+3 more reviewers
@eddybeddybeddyb left review comments
@jonas-schievinkjonas-schievinkjonas-schievink left review comments
@ecstatic-morseecstatic-morseecstatic-morse left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@shepmastershepmaster

Labels

merged-by-borsThis PR was explicitly merged by bors.O-AVRTarget: AVR processors (ATtiny, ATmega, etc.)relnotesMarks issues that should be documented in the release notes of the next release.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.WG-embeddedWorking group: Embedded systems

Projects

None yet

Milestone

1.45

Development

Successfully merging this pull request may close these issues.

17 participants

@dylanmckay@rust-highfive@shepmaster@estebank@bors@jonas-schievink@thejpster@crlf0710@mati865@Dylan-DPC-zz@RalfJung@Restioson@jplatte@eddyb@ecstatic-morse@JohnCSimon@Elinvynia