Use the gnu_time64_abi config to control which glibc symbols to redirect

Refines "Use _TIME_BITS and _FILE_OFFSET_BITS=64 versions of glibc symbols"

Author: snogge

src/unix/linux_like/linux/gnu/b32/mod.rs

@@ -355,7 +355,7 @@ extern "C" {
         newp: *mut ::c_void,
         newlen: ::size_t,
     ) -> ::c_int;
-    #[link_name = "__ntp_gettime64"]
+    #[cfg_attr(gnu_time64_abi, link_name = "__ntp_gettime64")]
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
 }
 

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

@@ -1074,20 +1074,14 @@ extern "C" {
         >,
         arg: *mut ::c_void,
     );
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__sendmmsg64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__sendmmsg64")]
     pub fn sendmmsg(
         sockfd: ::c_int,
         msgvec: *mut ::mmsghdr,
         vlen: ::c_uint,
         flags: ::c_int,
     ) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__recvmmsg64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__recvmmsg64")]
     pub fn recvmmsg(
         sockfd: ::c_int,
         msgvec: *mut ::mmsghdr,
@@ -1098,20 +1092,11 @@ extern "C" {
 
     pub fn getrlimit64(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit64) -> ::c_int;
     pub fn setrlimit64(resource: ::__rlimit_resource_t, rlim: *const ::rlimit64) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "getrlimit64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "getrlimit64")]
     pub fn getrlimit(resource: ::__rlimit_resource_t, rlim: *mut ::rlimit) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "setrlimit64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "setrlimit64")]
     pub fn setrlimit(resource: ::__rlimit_resource_t, rlim: *const ::rlimit) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "prlimit64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "prlimit64")]
     pub fn prlimit(
         pid: ::pid_t,
         resource: ::__rlimit_resource_t,
@@ -1134,10 +1119,7 @@ extern "C" {
     pub fn endutxent();
     pub fn getpt() -> ::c_int;
     pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__gettimeofday64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__gettimeofday64")]
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
     pub fn statx(
         dirfd: ::c_int,
@@ -1150,20 +1132,11 @@ extern "C" {
     pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
     pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
 
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "___adjtimex64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "___adjtimex64")]
     pub fn adjtimex(buf: *mut timex) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "___adjtimex64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "___adjtimex64")]
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__clock_adjtime64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__clock_adjtime64")]
     pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;
 
     pub fn fanotify_mark(
@@ -1173,21 +1146,15 @@ extern "C" {
         dirfd: ::c_int,
         path: *const ::c_char,
     ) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "preadv64v2"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "preadv64v2")]
     pub fn preadv2(
         fd: ::c_int,
         iov: *const ::iovec,
         iovcnt: ::c_int,
         offset: ::off_t,
         flags: ::c_int,
     ) -> ::ssize_t;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "pwritev64v2"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "pwritev64v2")]
     pub fn pwritev2(
         fd: ::c_int,
         iov: *const ::iovec,
@@ -1223,26 +1190,17 @@ extern "C" {
     pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 
     pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__ioctl_time64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__ioctl_time64")]
     pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
     pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__glob64_time64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__glob64_time64")]
     pub fn glob64(
         pattern: *const ::c_char,
         flags: ::c_int,
         errfunc: ::Option<extern "C" fn(epath: *const ::c_char, errno: ::c_int) -> ::c_int>,
         pglob: *mut glob64_t,
     ) -> ::c_int;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__globfree64_time64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__globfree64_time64")]
     pub fn globfree64(pglob: *mut glob64_t);
     pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
     pub fn pthread_attr_getaffinity_np(
@@ -1309,10 +1267,7 @@ extern "C" {
     pub fn eaccess(pathname: *const ::c_char, mode: ::c_int) -> ::c_int;
 
     pub fn asctime_r(tm: *const ::tm, buf: *mut ::c_char) -> *mut ::c_char;
-    #[cfg_attr(
-        all(target_pointer_width = "32", not(target_arch = "x86_64")),
-        link_name = "__ctime64_r"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "__ctime64_r")]
     pub fn ctime_r(timep: *const time_t, buf: *mut ::c_char) -> *mut ::c_char;
 
     pub fn strftime(

src/unix/linux_like/linux/mod.rs

@@ -4105,45 +4105,24 @@ safe_f! {
 cfg_if! {
     if #[cfg(all(not(target_env = "uclibc"), not(target_env = "ohos")))] {
         extern "C" {
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "aio_read64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "aio_read64")]
             pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "aio_write64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "aio_write64")]
             pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
             pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "aio_error64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "aio_error64")]
             pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "aio_return64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "aio_return64")]
             pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "__aio_suspend_time64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "__aio_suspend_time64")]
             pub fn aio_suspend(
                 aiocb_list: *const *const aiocb,
                 nitems: ::c_int,
                 timeout: *const ::timespec,
             ) -> ::c_int;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "aio_cancel64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "aio_cancel64")]
             pub fn aio_cancel(fd: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
-            #[cfg_attr(
-                all(target_env = "gnu", target_pointer_width = "32", not(target_arch = "x86_64")),
-                link_name = "lio_listio64"
-            )]
+            #[cfg_attr(gnu_time64_abi, link_name = "lio_listio64")]
             pub fn lio_listio(
                 mode: ::c_int,
                 aiocb_list: *const *mut aiocb,
@@ -4399,14 +4378,7 @@ extern "C" {
         link_name = "fallocate64"
     )]
     pub fn fallocate(fd: ::c_int, mode: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
-    #[cfg_attr(
-        all(
-            target_env = "gnu",
-            target_pointer_width = "32",
-            not(target_arch = "x86_64")
-        ),
-        link_name = "posix_fallocate64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "posix_fallocate64")]
     pub fn posix_fallocate(fd: ::c_int, offset: ::off_t, len: ::off_t) -> ::c_int;
     pub fn readahead(fd: ::c_int, offset: ::off64_t, count: ::size_t) -> ::ssize_t;
     pub fn getxattr(

src/unix/mod.rs

@@ -475,23 +475,13 @@ extern "C" {
         all(target_os = "macos", target_arch = "x86"),
         link_name = "fopen$UNIX2003"
     )]
-    #[cfg_attr(
-        all(target_os = "linux", target_env = "gnu", target_pointer_width = "32"),
-        link_name = "fopen64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "fopen64")]
     pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
         link_name = "freopen$UNIX2003"
     )]
-    #[cfg_attr(
-        all(
-            target_env = "gnu",
-            target_pointer_width = "32",
-            not(target_arch = "x86_64")
-        ),
-        link_name = "freopen64"
-    )]
+    #[cfg_attr(gnu_time64_abi, link_name = "freopen64")]
     pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
 
     pub fn fflush(file: *mut FILE) -> c_int;