diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:48 +0000 |
| commit | ef24de24a82fe681581cc130f342363c47c0969a (patch) | |
| tree | 0d494f7e1a38b95c92426f58fe6eaa877303a86c /vendor/rustix/src/param | |
| parent | Releasing progress-linux version 1.74.1+dfsg1-1~progress7.99u1. (diff) | |
| download | rustc-ef24de24a82fe681581cc130f342363c47c0969a.tar.xz rustc-ef24de24a82fe681581cc130f342363c47c0969a.zip | |
Merging upstream version 1.75.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/rustix/src/param')
| -rw-r--r-- | vendor/rustix/src/param/auxv.rs | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/vendor/rustix/src/param/auxv.rs b/vendor/rustix/src/param/auxv.rs index 03be2a29d..19f93dc04 100644 --- a/vendor/rustix/src/param/auxv.rs +++ b/vendor/rustix/src/param/auxv.rs @@ -1,12 +1,9 @@ use crate::backend; #[cfg(any( linux_raw, - all( - libc, - any( - all(target_os = "android", target_pointer_width = "64"), - target_os = "linux", - ) + any( + all(target_os = "android", target_pointer_width = "64"), + target_os = "linux", ) ))] use crate::ffi::CStr; @@ -39,7 +36,7 @@ pub fn page_size() -> usize { /// /// [POSIX]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/sysconf.html /// [Linux]: https://man7.org/linux/man-pages/man3/sysconf.3.html -#[cfg(not(target_os = "wasi"))] +#[cfg(not(any(target_os = "vita", target_os = "wasi")))] #[inline] #[doc(alias = "_SC_CLK_TCK")] pub fn clock_ticks_per_second() -> u64 { @@ -58,12 +55,9 @@ pub fn clock_ticks_per_second() -> u64 { /// [Linux]: https://man7.org/linux/man-pages/man3/getauxval.3.html #[cfg(any( linux_raw, - all( - libc, - any( - all(target_os = "android", target_pointer_width = "64"), - target_os = "linux", - ) + any( + all(target_os = "android", target_pointer_width = "64"), + target_os = "linux", ) ))] #[inline] @@ -82,12 +76,9 @@ pub fn linux_hwcap() -> (usize, usize) { /// [Linux]: https://man7.org/linux/man-pages/man3/getauxval.3.html #[cfg(any( linux_raw, - all( - libc, - any( - all(target_os = "android", target_pointer_width = "64"), - target_os = "linux", - ) + any( + all(target_os = "android", target_pointer_width = "64"), + target_os = "linux", ) ))] #[inline] |