hexagon: decouple time64 types from musl symbol redirects

The `musl32_time64` cfg previously conflated two distinct concepts:

1. Type definitions: `time_t` is `i64`, `suseconds_t` is `i64`,
   `timespec` has padding — applies to all 32-bit musl v1.2.3+ targets
   including hexagon.

2. Symbol redirects: `clock_gettime` → `__clock_gettime64` etc.,
   corresponding to musl's `_REDIR_TIME64` — applies only to arm,
   mips, powerpc, and x86.

Hexagon was added to musl after the time64 transition and never had a
32-bit `time_t`, so its libc exports `clock_gettime` directly with no
`__*_time64` symbols. Applying the link-name redirects caused undefined
symbol errors at link time (rust-lang/rust#154686).

Introduce a new `musl_redir_time64` cfg for the symbol redirects and
restrict it to arches that define `_REDIR_TIME64`. Keep `musl32_time64`
for the type/struct meaning, now set generically for all 32-bit musl
v1.2.3+ targets (removing explicit `target_arch = "hexagon"` conditions).

(backport <#5040>)
(cherry picked from commit a6b660c)

Author: androm3da

build.rs

@@ -28,8 +28,10 @@ const ALLOWED_CFGS: &[&str] = &[
     // Corresponds to `__USE_TIME_BITS64` in UAPI
     "linux_time_bits64",
     "musl_v1_2_3",
-    // Corresponds to `_REDIR_TIME64` in musl
+    // musl v1.2.3+ && 32-bit: time_t is i64, struct layouts change
     "musl32_time64",
+    // Corresponds to `_REDIR_TIME64` in musl: symbol redirects to __*_time64
+    "musl_redir_time64",
     "vxworks_lt_25_09",
 ];
 
@@ -51,8 +53,9 @@ const CHECK_CFG_EXTRA: &[(&str, &[&str])] = &[
     ),
 ];
 
-/// Musl architectures that set `#define _REDIR_TIME64 1`.
-const MUSL_REDIR_TIME64_ARCHES: &[&str] = &["arm", "hexagon", "mips", "powerpc", "x86"];
+/// Musl architectures that define `_REDIR_TIME64` (i.e. those that transitioned
+/// from 32-bit to 64-bit `time_t` and need `__*_time64` symbol redirects).
+const MUSL_REDIR_TIME64_ARCHES: &[&str] = &["arm", "mips", "powerpc", "x86"];
 
 fn main() {
     // Avoid unnecessary re-building.
@@ -117,10 +120,13 @@ fn main() {
 
     if musl && musl_v1_2_3 {
         set_cfg("musl_v1_2_3");
-        if MUSL_REDIR_TIME64_ARCHES.contains(&target_arch.as_str()) {
+        if target_ptr_width == "32" {
             set_cfg("musl32_time64");
             set_cfg("linux_time_bits64");
         }
+        if MUSL_REDIR_TIME64_ARCHES.contains(&target_arch.as_str()) {
+            set_cfg("musl_redir_time64");
+        }
     }
 
     let linux_time_bits64 = env::var("RUST_LIBC_UNSTABLE_LINUX_TIME_BITS64").is_ok();

libc-test/build.rs

@@ -3869,13 +3869,18 @@ fn test_linux(target: &str) {
     }
     let old_musl = musl && !musl_v1_2_3;
 
+    let b32 = arm || target.contains("hexagon") || mips32 || ppc32 || x86_32;
+
     let mut cfg = ctest_cfg();
     if (musl_v1_2_3 || loongarch64 || hexagon) && musl {
         cfg.cfg("musl_v1_2_3", None);
-        if arm || hexagon || ppc32 || x86_32 || mips32 {
+        if b32 {
             cfg.cfg("musl32_time64", None);
             cfg.cfg("linux_time_bits64", None);
         }
+        if arm || ppc32 || x86_32 || mips32 {
+            cfg.cfg("musl_redir_time64", None);
+        }
     }
     cfg.define("_GNU_SOURCE", None)
         // This macro re-defines fscanf,scanf,sscanf to link to the symbols that are
@@ -4364,6 +4369,7 @@ fn test_linux(target: &str) {
                 || name.starts_with("STATX_")
                 || name.starts_with("SW_")
                 || name.starts_with("SYS_")
+                || name.starts_with("SYS3264_")
                 || name.starts_with("TCP_")
                 || name.starts_with("UINPUT_")
                 || name.starts_with("VMADDR_")

src/new/common/posix/pthread.rs

@@ -195,7 +195,7 @@ extern "C" {
 
     #[cfg(any(target_os = "android", target_os = "l4re", target_os = "linux"))]
     #[cfg_attr(gnu_time_bits64, link_name = "__pthread_mutex_timedlock64")]
-    #[cfg_attr(musl32_time64, link_name = "__pthread_mutex_timedlock_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__pthread_mutex_timedlock_time64")]
     pub fn pthread_mutex_timedlock(
         lock: *mut crate::pthread_mutex_t,
         abstime: *const crate::timespec,

src/new/musl/sys/socket.rs

@@ -41,7 +41,7 @@ extern "C" {
         vlen: c_uint,
         flags: c_uint,
     ) -> c_int;
-    #[cfg_attr(musl32_time64, link_name = "__recvmmsg_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__recvmmsg_time64")]
     pub fn recvmmsg(
         sockfd: c_int,
         msgvec: *mut crate::mmsghdr,

src/unix/linux_like/linux/mod.rs

@@ -4046,7 +4046,7 @@ cfg_if! {
                 msg_prio: *mut c_uint,
             ) -> ssize_t;
             #[cfg_attr(
-                any(gnu_time_bits64, musl32_time64),
+                any(gnu_time_bits64, musl_redir_time64),
                 link_name = "__mq_timedreceive_time64"
             )]
             pub fn mq_timedreceive(
@@ -4063,7 +4063,7 @@ cfg_if! {
                 msg_prio: c_uint,
             ) -> c_int;
             #[cfg_attr(
-                any(gnu_time_bits64, musl32_time64),
+                any(gnu_time_bits64, musl_redir_time64),
                 link_name = "__mq_timedsend_time64"
             )]
             pub fn mq_timedsend(
@@ -4089,7 +4089,7 @@ extern "C" {
     pub fn lcong48(p: *mut c_ushort);
 
     #[cfg_attr(gnu_time_bits64, link_name = "__lutimes64")]
-    #[cfg_attr(musl32_time64, link_name = "__lutimes_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__lutimes_time64")]
     pub fn lutimes(file: *const c_char, times: *const crate::timeval) -> c_int;
 
     pub fn shm_open(name: *const c_char, oflag: c_int, mode: mode_t) -> c_int;
@@ -4165,9 +4165,15 @@ extern "C" {
     pub fn fremovexattr(filedes: c_int, name: *const c_char) -> c_int;
     pub fn signalfd(fd: c_int, mask: *const crate::sigset_t, flags: c_int) -> c_int;
     pub fn timerfd_create(clockid: crate::clockid_t, flags: c_int) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__timerfd_gettime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__timerfd_gettime64"
+    )]
     pub fn timerfd_gettime(fd: c_int, curr_value: *mut crate::itimerspec) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__timerfd_settime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__timerfd_settime64"
+    )]
     pub fn timerfd_settime(
         fd: c_int,
         flags: c_int,
@@ -4184,7 +4190,7 @@ extern "C" {
     ) -> c_int;
     pub fn dup3(oldfd: c_int, newfd: c_int, flags: c_int) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__sigtimedwait64")]
-    #[cfg_attr(musl32_time64, link_name = "__sigtimedwait_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__sigtimedwait_time64")]
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
@@ -4247,7 +4253,7 @@ extern "C" {
     pub fn eventfd_write(fd: c_int, value: eventfd_t) -> c_int;
 
     #[cfg_attr(gnu_time_bits64, link_name = "__sched_rr_get_interval64")]
-    #[cfg_attr(musl32_time64, link_name = "__sched_rr_get_interval_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__sched_rr_get_interval_time64")]
     pub fn sched_rr_get_interval(pid: crate::pid_t, tp: *mut crate::timespec) -> c_int;
     pub fn sched_setparam(pid: crate::pid_t, param: *const crate::sched_param) -> c_int;
     pub fn setns(fd: c_int, nstype: c_int) -> c_int;
@@ -4265,7 +4271,7 @@ extern "C" {
     ) -> c_int;
     pub fn sched_getscheduler(pid: crate::pid_t) -> c_int;
     #[cfg_attr(
-        any(gnu_time_bits64, musl32_time64),
+        any(gnu_time_bits64, musl_redir_time64),
         link_name = "__clock_nanosleep_time64"
     )]
     pub fn clock_nanosleep(

src/unix/linux_like/linux/musl/mod.rs

@@ -765,7 +765,7 @@ extern "C" {
         new_limit: *const crate::rlimit,
         old_limit: *mut crate::rlimit,
     ) -> c_int;
-    #[cfg_attr(musl32_time64, link_name = "__gettimeofday_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__gettimeofday_time64")]
     pub fn gettimeofday(tp: *mut crate::timeval, tz: *mut c_void) -> c_int;
     pub fn ptrace(request: c_int, ...) -> c_long;
     pub fn getpriority(which: c_int, who: crate::id_t) -> c_int;
@@ -801,9 +801,9 @@ extern "C" {
     // Added in `musl` 1.2.2
     pub fn reallocarray(ptr: *mut c_void, nmemb: size_t, size: size_t) -> *mut c_void;
 
-    #[cfg_attr(musl32_time64, link_name = "__adjtimex_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__adjtimex_time64")]
     pub fn adjtimex(buf: *mut crate::timex) -> c_int;
-    #[cfg_attr(musl32_time64, link_name = "__clock_adjtime64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__clock_adjtime64")]
     pub fn clock_adjtime(clk_id: crate::clockid_t, buf: *mut crate::timex) -> c_int;
 
     pub fn ctermid(s: *mut c_char) -> *mut c_char;
@@ -871,7 +871,7 @@ extern "C" {
     pub fn utmpxname(file: *const c_char) -> c_int;
     pub fn pthread_tryjoin_np(thread: crate::pthread_t, retval: *mut *mut c_void) -> c_int;
     #[cfg_attr(
-        all(musl32_time64, target_pointer_width = "32"),
+        all(musl_redir_time64, target_pointer_width = "32"),
         link_name = "__pthread_timedjoin_np_time64"
     )]
     pub fn pthread_timedjoin_np(

src/unix/linux_like/linux_l4re_shared.rs

@@ -976,7 +976,7 @@ pub const IPC_NOWAIT: c_int = 0o4000;
 
 pub const IPC_RMID: c_int = 0;
 pub const IPC_SET: c_int = 1;
-pub const IPC_STAT: c_int = if cfg!(musl32_time64) { 0x102 } else { 2 };
+pub const IPC_STAT: c_int = if cfg!(musl_redir_time64) { 0x102 } else { 2 };
 pub const IPC_INFO: c_int = 3;
 
 pub const SHM_R: c_int = 0o400;
@@ -1660,7 +1660,7 @@ cfg_if! {
             #[cfg_attr(gnu_file_offset_bits64, link_name = "aio_return64")]
             pub fn aio_return(aiocbp: *mut crate::aiocb) -> ssize_t;
             #[cfg_attr(
-                any(musl32_time64, gnu_time_bits64),
+                any(musl_redir_time64, gnu_time_bits64),
                 link_name = "__aio_suspend_time64"
             )]
             pub fn aio_suspend(
@@ -1725,7 +1725,7 @@ cfg_if! {
                 flags: c_ulong,
             ) -> isize;
             #[cfg_attr(gnu_time_bits64, link_name = "__futimes64")]
-            #[cfg_attr(musl32_time64, link_name = "__futimes_time64")]
+            #[cfg_attr(musl_redir_time64, link_name = "__futimes_time64")]
             pub fn futimes(fd: c_int, times: *const crate::timeval) -> c_int;
         }
     }
@@ -1827,10 +1827,10 @@ extern "C" {
     ) -> c_int;
     pub fn sched_get_priority_max(policy: c_int) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__settimeofday64")]
-    #[cfg_attr(musl32_time64, link_name = "__settimeofday_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__settimeofday_time64")]
     pub fn settimeofday(tv: *const crate::timeval, tz: *const crate::timezone) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__sem_timedwait64")]
-    #[cfg_attr(musl32_time64, link_name = "__sem_timedwait_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__sem_timedwait_time64")]
     pub fn sem_timedwait(sem: *mut crate::sem_t, abstime: *const crate::timespec) -> c_int;
     pub fn sem_getvalue(sem: *mut crate::sem_t, sval: *mut c_int) -> c_int;
     pub fn mount(
@@ -1843,7 +1843,7 @@ extern "C" {
     #[cfg_attr(gnu_time_bits64, link_name = "__prctl_time64")]
     pub fn prctl(option: c_int, ...) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__ppoll64")]
-    #[cfg_attr(musl32_time64, link_name = "__ppoll_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__ppoll_time64")]
     pub fn ppoll(
         fds: *mut crate::pollfd,
         nfds: crate::nfds_t,
@@ -1934,9 +1934,15 @@ extern "C" {
     pub fn timer_delete(timerid: crate::timer_t) -> c_int;
     #[cfg(not(target_os = "l4re"))]
     pub fn timer_getoverrun(timerid: crate::timer_t) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__timer_gettime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__timer_gettime64"
+    )]
     pub fn timer_gettime(timerid: crate::timer_t, curr_value: *mut crate::itimerspec) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__timer_settime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__timer_settime64"
+    )]
     pub fn timer_settime(
         timerid: crate::timer_t,
         flags: c_int,

src/unix/linux_like/mod.rs

@@ -1873,20 +1873,26 @@ extern "C" {
     pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar) -> c_int;
 
     #[cfg_attr(gnu_time_bits64, link_name = "__clock_getres64")]
-    #[cfg_attr(musl32_time64, link_name = "__clock_getres_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__clock_getres_time64")]
     pub fn clock_getres(clk_id: crate::clockid_t, tp: *mut crate::timespec) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__clock_gettime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__clock_gettime64"
+    )]
     pub fn clock_gettime(clk_id: crate::clockid_t, tp: *mut crate::timespec) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__clock_settime64")]
+    #[cfg_attr(
+        any(gnu_time_bits64, musl_redir_time64),
+        link_name = "__clock_settime64"
+    )]
     pub fn clock_settime(clk_id: crate::clockid_t, tp: *const crate::timespec) -> c_int;
     #[cfg(not(target_os = "l4re"))]
     pub fn clock_getcpuclockid(pid: crate::pid_t, clk_id: *mut crate::clockid_t) -> c_int;
 
     #[cfg_attr(gnu_time_bits64, link_name = "__getitimer64")]
-    #[cfg_attr(musl32_time64, link_name = "__getitimer_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__getitimer_time64")]
     pub fn getitimer(which: c_int, curr_value: *mut crate::itimerval) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__setitimer64")]
-    #[cfg_attr(musl32_time64, link_name = "__setitimer_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__setitimer_time64")]
     pub fn setitimer(
         which: c_int,
         new_value: *const crate::itimerval,
@@ -1907,11 +1913,11 @@ extern "C" {
     #[cfg_attr(gnu_file_offset_bits64, link_name = "posix_fadvise64")]
     pub fn posix_fadvise(fd: c_int, offset: off_t, len: off_t, advise: c_int) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__futimens64")]
-    #[cfg_attr(musl32_time64, link_name = "__futimens_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__futimens_time64")]
     #[cfg(not(target_os = "l4re"))]
     pub fn futimens(fd: c_int, times: *const crate::timespec) -> c_int;
     #[cfg_attr(gnu_time_bits64, link_name = "__utimensat64")]
-    #[cfg_attr(musl32_time64, link_name = "__utimensat_time64")]
+    #[cfg_attr(musl_redir_time64, link_name = "__utimensat_time64")]
     pub fn utimensat(
         dirfd: c_int,
         path: *const c_char,
@@ -1963,7 +1969,7 @@ extern "C" {
     pub fn setresgid(rgid: crate::gid_t, egid: crate::gid_t, sgid: crate::gid_t) -> c_int;
     #[cfg(not(target_os = "l4re"))]
     pub fn setresuid(ruid: crate::uid_t, euid: crate::uid_t, suid: crate::uid_t) -> c_int;
-    #[cfg_attr(any(gnu_time_bits64, musl32_time64), link_name = "__wait4_time64")]
+    #[cfg_attr(any(gnu_time_bits64, musl_redir_time64), link_name = "__wait4_time64")]
     #[cfg(not(target_os = "l4re"))]
     pub fn wait4(
         pid: crate::pid_t,