fixup! Print thread ID in panic message if thread name is unknown

Author: tgross35

library/std/src/sys/pal/unix/thread.rs

@@ -323,9 +323,15 @@ pub(crate) fn current_os_id() -> Option<u64> {
     // slightly different spellings.
     cfg_if::cfg_if! {
         // Most platforms have a function returning a `pid_t` or int, which is an `i32`.
-        if #[cfg(any(target_os = "android", target_os = "linux", target_os = "nto"))] {
+        if #[cfg(any(target_os = "android", target_os = "linux"))] {
+            use crate::sys::weak::syscall;
+
+            // `libc::gettid` is only available on glibc 2.30+, but the syscall is available
+            // since Linux 2.4.11.
+            syscall!(fn gettid() -> libc::pid_t;);
+
             // SAFETY: FFI call with no preconditions.
-            let id: libc::pid_t = unsafe { libc::gettid() };
+            let id: libc::pid_t = unsafe { gettid() };
             Some(id as u64)
         } else if #[cfg(target_os = "openbsd")] {
             // SAFETY: FFI call with no preconditions.
@@ -339,6 +345,13 @@ pub(crate) fn current_os_id() -> Option<u64> {
             // SAFETY: FFI call with no preconditions.
             let id: libc::lwpid_t = unsafe { libc::_lwp_self() };
             Some(id as u64)
+        } else if #[cfg(all(target_os = "nto", not(target_env = "nto70")))] {
+            // Neutrino has `gettid` since 7.1. 7.0 is our oldest supported version so exclude it.
+            // SAFETY: FFI call with no preconditions.
+            let id: libc::pid_t = unsafe { libc::gettid() };
+            Some(id as u64)
+        } else if #[cfg(target_os = "nto")] {
+            None
         } else if #[cfg(target_vendor = "apple")] {
             // Apple allows querying arbitrary thread IDs, `thread=NULL` queries the current thread.
             let mut id = 0u64;