libc icon indicating copy to clipboard operation
libc copied to clipboard

Move rtems cfg-ed import with the others

Open tgross35 opened this issue 1 year ago • 3 comments

Clean up code added in https://github.com/rust-lang/libc/pull/3866

tgross35 avatar Sep 17 '24 16:09 tgross35

r? @JohnTitor

rustbot has assigned @JohnTitor. They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot avatar Sep 17 '24 16:09 rustbot

@thesummer just noticed this when starting a backport, is there any reason it was in a separate cfg block in https://github.com/rust-lang/libc/pull/3866?

tgross35 avatar Sep 17 '24 16:09 tgross35

@thesummer just noticed this when starting a backport, is there any reason it was in a separate cfg block in #3866?

@tgross35 Yes, IIRC it is because I also need the arm config block enabled. If it is in the general else-if chain it will be only one of the two. Atm one could include the arm module also in the rtems branch. However, this might need to be changed if other RTEMS targets are added (but we can also change it when the time comes).

thesummer avatar Sep 17 '24 17:09 thesummer

@tgross35 Sorry, I was a bit pre-occupied the last week and lost track of the status here. Is there anything else I can help you with?

thesummer avatar Sep 27 '24 09:09 thesummer

@tgross35 Is there anything I can help with to get the changes merged into the libc-0.2 branch / release?

There is a conference coming soon with some of the RTEMS folk present and I was hoping to give them a demo with the sources of the public repos, so they can start playing around with Rust as well 🙏.

thesummer avatar Oct 10 '24 18:10 thesummer

Oh don't worry about this, I just forgot to close it :) Thanks for the follow up, we'll figure out something better at some point but it isn't pressing.

tgross35 avatar Oct 11 '24 22:10 tgross35

@tgross35 ok, thanks. Should I prepare a PR for backporting the things to the libc-0.2 branch?

thesummer avatar Oct 12 '24 09:10 thesummer

Don't worry about it, I plan to do a round of cherry picks this weekend and will include the relevant ones as long as there isn't any major conflict.

tgross35 avatar Oct 12 '24 16:10 tgross35

Perfect. Thanks a lot.

thesummer avatar Oct 12 '24 17:10 thesummer