Add QNX NTO platform support

rust-lang · Aug 1, 2024 · 64cbb2b · 64cbb2b
1 parent fd0aed5
commit 64cbb2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs
@@ -176,7 +176,6 @@ cfg_if::cfg_if! {
                 unix,
                 not(target_os = "emscripten"),
                 not(all(target_os = "ios", target_arch = "arm")),
-                not(all(target_os = "nto", target_env = "nto70")),
             ),
             all(
                 target_env = "sgx",

diff --git a/src/symbolize/gimli.rs b/src/symbolize/gimli.rs
@@ -226,6 +226,7 @@ cfg_if::cfg_if! {
             target_os = "hurd",
             target_os = "openbsd",
             target_os = "netbsd",
+            target_os = "nto",
             all(target_os = "android", feature = "dl_iterate_phdr"),
         ),
         not(target_env = "uclibc"),

diff --git a/src/symbolize/gimli/libs_dl_iterate_phdr.rs b/src/symbolize/gimli/libs_dl_iterate_phdr.rs
@@ -37,8 +37,10 @@ fn infer_current_exe(base_addr: usize) -> OsString {
 
 // `info` should be a valid pointers.
 // `vec` should be a valid pointer to a `std::Vec`.
+// On `QNX-NTO` platform, info is a const pointer
 unsafe extern "C" fn callback(
-    info: *mut libc::dl_phdr_info,
+    #[cfg(not(target_os = "nto"))] info: *mut libc::dl_phdr_info,
+    #[cfg(target_os = "nto")] info: *const libc::dl_phdr_info,
     _size: libc::size_t,
     vec: *mut libc::c_void,
 ) -> libc::c_int {