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

Add QNX NTO platform support #3815

Merged
merged 1 commit into from
Aug 13, 2024
Merged

Add QNX NTO platform support #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,13 +469,14 @@ s! {
// to false. So I'm just removing these, and if uClibc changes
// the #if block in the future to include the following fields, these
// will probably need including here. tsidea, skrap
#[cfg(not(target_env = "uclibc"))]
// QNX (NTO) platform does not define these fields
#[cfg(not(any(target_env = "uclibc", target_os = "nto")))]
pub dlpi_adds: ::c_ulonglong,
#[cfg(not(target_env = "uclibc"))]
#[cfg(not(any(target_env = "uclibc", target_os = "nto")))]
pub dlpi_subs: ::c_ulonglong,
#[cfg(not(target_env = "uclibc"))]
#[cfg(not(any(target_env = "uclibc", target_os = "nto")))]
pub dlpi_tls_modid: ::size_t,
#[cfg(not(target_env = "uclibc"))]
#[cfg(not(any(target_env = "uclibc", target_os = "nto")))]
pub dlpi_tls_data: *mut ::c_void,
}

Expand Down
5 changes: 4 additions & 1 deletion src/unix/nto/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3339,7 +3339,10 @@ extern "C" {
pub fn dl_iterate_phdr(
callback: ::Option<
unsafe extern "C" fn(
info: *const dl_phdr_info,
// The original .h file declares this as *const, but for consistency with other platforms,
// changing this to *mut to make it easier to use.
// Maybe in v0.3 all platforms should use this as a *const.
info: *mut dl_phdr_info,
size: ::size_t,
data: *mut ::c_void,
) -> ::c_int,
Expand Down