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

Author: tgross35

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

@@ -333,6 +333,10 @@ pub(crate) fn current_os_id() -> Option<u64> {
             // SAFETY: FFI call with no preconditions.
             let id: libc::pid_t = unsafe { gettid() };
             Some(id as u64)
+        } else if #[cfg(target_os = "nto")] {
+            // SAFETY: FFI call with no preconditions.
+            let id: libc::pid_t = unsafe { libc::gettid() };
+            Some(id as u64)
         } else if #[cfg(target_os = "openbsd")] {
             // SAFETY: FFI call with no preconditions.
             let id: libc::pid_t = unsafe { libc::getthrid() };
@@ -345,13 +349,6 @@ 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;