Skip to content
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

Jump to bottom

Added custom risc32-imac for esp-espidf target #111369

Merged
merged 1 commit into from Jun 6, 2023
Merged

Added custom risc32-imac for esp-espidf target #111369

merged 1 commit into from Jun 6, 2023

Conversation

Nassiel
Copy link
Contributor

@Nassiel Nassiel commented May 8, 2023

ESP32-C6 and the upcoming ESP32-P4 are the first Espressif chips that support the "A" (atomic) extension of the RISCV specification.
As such, they do not work with the existing riscv32imc-esp-espidf target and instead need a new one (in this PR) called riscv32imac-esp-espidf.

@rustbot
Copy link
Collaborator

rustbot commented May 8, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @b-naber (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 8, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 8, 2023

These commits modify compiler targets.
(See the Target Tier Policy.)

@Nassiel
Copy link
Contributor Author

Nassiel commented May 8, 2023

Adding @MabezDev @ivmarkov for reviewing.

@Nassiel
Copy link
Contributor Author

Nassiel commented May 8, 2023

r? compiler-team

@rustbot rustbot assigned oli-obk and unassigned b-naber May 8, 2023
@Urgau
Copy link
Contributor

Urgau commented May 9, 2023

Adding the entry in the platform support page is a first good step, the second is to actually add the page in src/doc/rustc/src/platform-support/. Take a look at the template and an example for what is roughly expected.

@MabezDev
Copy link
Contributor

MabezDev commented May 9, 2023

Adding the entry in the platform support page is a first good step, the second is to actually add the page in src/doc/rustc/src/platform-support/. Take a look at the template and an example for what is roughly expected.

The esp-idf platform is already supported, but our initial PR (#87666) didn't have the platform support content (just the mention in platform-support.md), perhaps it was missed or maybe this is a newer thing. I can add this in a separate PR.

@Urgau
Copy link
Contributor

Urgau commented May 9, 2023

The esp-idf platform is already supported, but our initial PR (#87666) didn't have the platform support content (just the mention in platform-support.md), perhaps it was missed or maybe this is a newer thing. I can add this in a separate PR.

I see, I that case adding the platform support page in a separate PR seems fine.
Doing it before this PR merges would be ideal though, as to make it clear that the target has the same requirements and is maintained by the same peoples.

@MabezDev MabezDev mentioned this pull request May 9, 2023
Merged
@MabezDev
Copy link
Contributor

MabezDev commented May 9, 2023

Opened #111389

@rust-log-analyzer

This comment has been minimized.

Sign in to view
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 11, 2023
@matthiaskrgr
Rollup merge of rust-lang#111389 - esp-rs:esp-idf-platform-support, r…
3b7c02b 
…=jyn514

Add esp-idf platform-support page

As mentioned in rust-lang#111369 (comment), the initial PR for esp-idf didn't include a platform support document which is required for the merge of  rust-lang#111369.
@bors
Copy link
Contributor

bors commented May 11, 2023

☔ The latest upstream changes (presumably #111452) made this pull request unmergeable. Please resolve the merge conflicts.

@Nassiel Nassiel closed this May 11, 2023
@Nassiel Nassiel reopened this May 11, 2023
@Nassiel
Copy link
Contributor Author

Nassiel commented May 11, 2023

@bors Hi!, solved :)

@MabezDev
Copy link
Contributor

@Nassiel Could you also update the table inside src/doc/rustc/src/platform-support/esp-idf.md to include the imac target?

@Nassiel
Copy link
Contributor Author

Nassiel commented May 12, 2023

@MabezDev Please validate the changes on esp-idf.md to proceed with the PR. Thank you!

@Nassiel
Copy link
Contributor Author

Nassiel commented May 12, 2023

@bors rollup

@bors
Copy link
Contributor

bors commented May 12, 2023

@Nassiel: 🔑 Insufficient privileges: not in try users

@Nassiel
Copy link
Contributor Author

Nassiel commented May 18, 2023

Hi @oli-obk do you have any clue of when this will be included?

@oli-obk
Copy link
Contributor

oli-obk commented May 22, 2023

Please rebase over the latest master so the merge commits go away and squash all your commits

@oli-obk
Copy link
Contributor

oli-obk commented May 22, 2023

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2023
@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 30, 2023

📌 Commit 947af4223a53157239605c08b0dbac224a699288 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors 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 May 30, 2023
@klensy
Copy link
Contributor

klensy commented May 30, 2023

Please rebase over the latest master so the merge commits go away and squash all your commits

Not done.

@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2023

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2023
@Nassiel
Copy link
Contributor Author

Nassiel commented May 30, 2023

@cjgillot @klensy @oli-obk Re-synced, please I'd appreciate some attention about this to avoid other merges before or this one will be always behind.

@klensy
Copy link
Contributor

klensy commented May 30, 2023

Key part of request was squash your commits to remove merge commits https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy

@sredman
Copy link

sredman commented Jun 1, 2023

@Nassiel -- In case you're not familiar, it's as simple as:
git fetch
git rebase -i origin/master -- Pick squash for all the commits after the first one
(and resolve merge conflicts, there was a simple one in the .md file when I tried)

I'm looking forward to this going in so I don't need to deal with a custom build 🙂

@Nassiel
Copy link
Contributor Author

Nassiel commented Jun 4, 2023 •
edited

@Nassiel -- In case you're not familiar, it's as simple as: git fetch git rebase -i origin/master -- Pick squash for all the commits after the first one (and resolve merge conflicts, there was a simple one in the .md file when I tried)

I'm looking forward to this going in so I don't need to deal with a custom build slightly_smiling_face

Or I'm doing something very wrong, or it fails everywhere. I merged from the master to this branch because there was a PR in parallel that modified my own files, so I needed to solve the conflict. Every time I try to do the squash, Git complains that I'm trying to squash a merge and that cannot be done.

So I took the middle street, redo all the changes from the source again, and did a push force. Now it's only ONE commit without merges.

Hope now it's compliance with the policies. @klensy @oli-obk

Honestly, I though this was a very stupid PR but it took a lot much more work than I expected for 4 files.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 5, 2023

Thanks. Sorry about the git pains. I forgot how it is as I haven't done a regular merge in a long time.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 5, 2023

📌 Commit 1f5361b has been approved by oli-obk

It is now in the queue for this repository.

@bors bors 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 5, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 6, 2023
@matthiaskrgr
Rollup merge of rust-lang#111369 - Nassiel:master, r=oli-obk
8e52ed8 
Added custom risc32-imac for esp-espidf target

ESP32-C6 and the upcoming ESP32-P4 are the first Espressif chips that support the "A" (atomic) extension of the RISCV specification.
As such, they do not work with the existing `riscv32imc-esp-espidf` target and instead need a new one (in this PR) called `riscv32imac-esp-espidf`.
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 6, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 6, 2023
@bors
Auto merge of rust-lang#112344 - matthiaskrgr:rollup-tswr83e, r=matth…
b2b34bd 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#111058 (Correct fortanix LVI test print function)
 - rust-lang#111369 (Added custom risc32-imac for esp-espidf target)
 - rust-lang#111962 (Make GDB Python Pretty Printers loadable after spawning GDB, avoiding required `rust-gdb`)
 - rust-lang#112019 (Don't suggest changing `&self` and `&mut self` in function signature to be mutable when taking `&mut self` in closure)
 - rust-lang#112199 (Fix suggestion for matching struct with `..` on both ends)
 - rust-lang#112220 (Cleanup some `EarlyBinder::skip_binder()` -> `EarlyBinder::subst_identity()`)
 - rust-lang#112325 (diagnostics: do not suggest type name tweaks on type-inferred closure args)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c4e11dc into rust-lang:master Jun 6, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 6, 2023
@sredman sredman mentioned this pull request Jun 10, 2023
Merged
@MabezDev MabezDev mentioned this pull request Jun 11, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MabezDev MabezDev MabezDev approved these changes

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

None yet