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.

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

sys: add MIPS R6 support #2138

Merged
merged 1 commit into from
Nov 13, 2023
Merged

sys: add MIPS R6 support #2138

merged 1 commit into from
Nov 13, 2023

Conversation

chenx97
Copy link
Contributor

@chenx97 chenx97 commented Sep 28, 2023

Currently, R6 targets are almost identical to their R2/R5 counterparts. So we add target_arch and bump libc.

@SteveLauC
Copy link
Member

Thanks for doing this! I think I will give it a check after dealing with our CI migration

@chenx97
Copy link
Contributor Author

chenx97 commented Oct 7, 2023

I'll migrate my log to towncrier soon

@SteveLauC
Copy link
Member

Upstream PRs:

Targets docs: mipsisa*r6*-unknown-linux-gnu*


Changes LGTM, but in case something could go wrong, I would like to have @asomers give this a double check

all(
qemu,
any(
target_arch = "mips",
Copy link
Member

Choose a reason for hiding this comment

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

This would be a good candidate for cfg_aliases, which we have discussed for other purposes.
https://docs.rs/cfg_aliases/latest/cfg_aliases/

Copy link
Member

Choose a reason for hiding this comment

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

If we are gonna replace most big-chunk, common cfg!s with some aliases, then it might be better to do it in another, dedicated PR, where we can replace them all and get them well documented in CONTRIBUTING.md

Copy link
Member

@SteveLauC SteveLauC Nov 13, 2023

Choose a reason for hiding this comment

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

#2188 issue filed, Let's merge this PR as-is

@asomers
Copy link
Member

asomers commented Nov 12, 2023

@chenx97 you'll need to rebase your PR to fix CI.

Currently R6 targets are almost identical to their R2/R5
counterparts.
@SteveLauC SteveLauC added this pull request to the merge queue Nov 13, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Nov 13, 2023
@SteveLauC SteveLauC added this pull request to the merge queue Nov 13, 2023
@SteveLauC SteveLauC removed this pull request from the merge queue due to a manual request Nov 13, 2023
@SteveLauC
Copy link
Member

SteveLauC commented Nov 13, 2023

There seems to be something wrong with our merge queue, the GHA checks simply don't run, then it reaches the timeout and gets removed from the queue

Update: seems that this is what we missed https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions

@SteveLauC SteveLauC mentioned this pull request Nov 13, 2023
3 tasks
@SteveLauC SteveLauC added this pull request to the merge queue Nov 13, 2023
Merged via the queue into nix-rust:master with commit 7c1045e Nov 13, 2023
35 checks passed
@chenx97 chenx97 deleted the mipsr6 branch November 17, 2023 08:54
chenx97 added a commit to chenx97/nix that referenced this pull request Mar 21, 2024
Currently R6 targets are almost identical to their R2/R5
counterparts.
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