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

Add QNX NTO platform support #3815

Merged
merged 1 commit into from
Aug 13, 2024
Merged

Conversation

nyurik
Copy link
Contributor

@nyurik nyurik commented Aug 13, 2024

This PR contains changes from #3790 and #3792 applied to the main branch per @tgross35 request

NTO does not define last four fields of the dl_phdr_info, so might as well exclude them for cleanliness.

v7.0: link
v7.1: link
v8.0: link

@rustbot
Copy link
Collaborator

rustbot commented Aug 13, 2024

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

@tgross35
Copy link
Contributor

tgross35 commented Aug 13, 2024

Great, thanks!

Missing field changes seem fine to me, @joshtriplett already approved the *const -> *mut at #3792.

@rustbot label +stable-nominated

@rustbot rustbot added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 13, 2024
Modify QNX NTO `dl_iterate_phdr` to toke `* mut`
All other platforms use `* mut`, and while this is technically a breaking change, most likely noone is using it directly.

NTO does not define last four fields of the `dl_phdr_info`, so might as well exclude them for cleanliness.

v7.0: [link](https://www.qnx.com/developers/docs/7.0.0/index.html#com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html)
v7.1: [link](https://www.qnx.com/developers/docs/7.1/#com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html)
v8.0: [link](https://www.qnx.com/developers/docs/8.0/com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html?hl=dl_phdr_info)

See also rust-lang/backtrace-rs#648
auto-merge was automatically disabled August 13, 2024 01:01

Head branch was pushed to by a user without write access

@tgross35 tgross35 added this pull request to the merge queue Aug 13, 2024
Merged via the queue into rust-lang:main with commit 617b489 Aug 13, 2024
39 checks passed
@nyurik nyurik deleted the nto-dl_phdr_info-main branch August 13, 2024 02:37
@nyurik
Copy link
Contributor Author

nyurik commented Aug 13, 2024

@tgross35 thx, merged! Do you have any aprox release timeline for v0.2 with this functionality? Thx!

@tgross35
Copy link
Contributor

I'll pick it up in my next batch of backports. Not sure about a release, I can't do them so I would like to get CI automation set up for that. Maybe later this week for that, releases should be trivial once it is done.

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 13, 2024
Modify QNX NTO `dl_iterate_phdr` to toke `* mut`
All other platforms use `* mut`, and while this is technically a breaking change, most likely noone is using it directly.

NTO does not define last four fields of the `dl_phdr_info`, so might as well exclude them for cleanliness.

v7.0: [link](https://www.qnx.com/developers/docs/7.0.0/index.html#com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html)
v7.1: [link](https://www.qnx.com/developers/docs/7.1/#com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html)
v8.0: [link](https://www.qnx.com/developers/docs/8.0/com.qnx.doc.neutrino.lib_ref/topic/d/dl_iterate_phdr.html?hl=dl_phdr_info)

See also rust-lang/backtrace-rs#648

(backport <rust-lang#3815>)
(cherry picked from commit 4edd266)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants