Merge pull request #3872 from tgross35/main-bamboo

[main] Apply three pull requests to main
rust-lang · Aug 29, 2024 · 812095c · 812095c
2 parents cce4997 + bf864e3
commit 812095c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/build.rs b/build.rs
@@ -22,7 +22,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
 
 // Extra values to allow for check-cfg.
 const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
-    ("target_os", &["switch", "aix", "ohos", "hurd"]),
+    ("target_os", &["switch", "aix", "ohos", "hurd", "visionos"]),
     ("target_env", &["illumos", "wasi", "aix", "ohos"]),
     (
         "target_arch",

diff --git a/libc-test/semver/android-aarch64.txt b/libc-test/semver/android-aarch64.txt
@@ -12,7 +12,9 @@ HWCAP2_SVESM4
 PROT_BTI
 PROT_MTE
 SYS_arch_specific_syscall
+SYS_lseek
 SYS_memfd_secret
+SYS_mmap
 SYS_syscalls
 SYS_fcntl
 __system_property_wait

diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -653,6 +653,7 @@ FUTEX_CMP_REQUEUE
 FUTEX_CMP_REQUEUE_PI
 FUTEX_FD
 FUTEX_LOCK_PI
+FUTEX_LOCK_PI2
 FUTEX_PRIVATE_FLAG
 FUTEX_REQUEUE
 FUTEX_TRYLOCK_PI

diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -6427,7 +6427,7 @@ cfg_if! {
     }
 }
 cfg_if! {
-    if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos"))] {
+    if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "visionos"))] {
         extern "C" {
             pub fn memmem(
                 haystack: *const ::c_void,

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -39,6 +39,7 @@ s! {
                       target_os = "ios",
                       target_os = "tvos",
                       target_os = "watchos",
+                      target_os = "visionos",
                       target_os = "netbsd",
                       target_os = "openbsd")))]
         pub pw_fields: ::c_int,
@@ -924,7 +925,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] {
+    if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos", target_os = "visionos"))] {
         mod apple;
         pub use self::apple::*;
     } else if #[cfg(any(target_os = "openbsd", target_os = "netbsd"))] {

diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs
@@ -192,6 +192,7 @@ pub const SYS_vhangup: ::c_long = 58;
 pub const SYS_pipe2: ::c_long = 59;
 pub const SYS_quotactl: ::c_long = 60;
 pub const SYS_getdents64: ::c_long = 61;
+pub const SYS_lseek: ::c_long = 62;
 pub const SYS_read: ::c_long = 63;
 pub const SYS_write: ::c_long = 64;
 pub const SYS_readv: ::c_long = 65;
@@ -348,6 +349,7 @@ pub const SYS_request_key: ::c_long = 218;
 pub const SYS_keyctl: ::c_long = 219;
 pub const SYS_clone: ::c_long = 220;
 pub const SYS_execve: ::c_long = 221;
+pub const SYS_mmap: ::c_long = 222;
 pub const SYS_swapon: ::c_long = 224;
 pub const SYS_swapoff: ::c_long = 225;
 pub const SYS_mprotect: ::c_long = 226;

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -3017,6 +3017,7 @@ pub const FUTEX_WAIT_BITSET: ::c_int = 9;
 pub const FUTEX_WAKE_BITSET: ::c_int = 10;
 pub const FUTEX_WAIT_REQUEUE_PI: ::c_int = 11;
 pub const FUTEX_CMP_REQUEUE_PI: ::c_int = 12;
+pub const FUTEX_LOCK_PI2: ::c_int = 13;
 
 pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
 pub const FUTEX_CLOCK_REALTIME: ::c_int = 256;

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -381,6 +381,7 @@ cfg_if! {
                         target_os = "ios",
                         target_os = "tvos",
                         target_os = "watchos",
+                        target_os = "visionos",
                         target_os = "android",
                         target_os = "openbsd",
                         target_os = "nto",
@@ -1043,7 +1044,8 @@ extern "C" {
             target_os = "macos",
             target_os = "ios",
             target_os = "tvos",
-            target_os = "watchos"
+            target_os = "watchos",
+            target_os = "visionos"
         ),
         link_name = "realpath$DARWIN_EXTSN"
     )]
@@ -1218,7 +1220,8 @@ extern "C" {
             target_os = "macos",
             target_os = "ios",
             target_os = "tvos",
-            target_os = "watchos"
+            target_os = "watchos",
+            target_os = "visionos"
         ),
         link_name = "res_9_init"
     )]
@@ -1581,6 +1584,7 @@ cfg_if! {
                         target_os = "ios",
                         target_os = "tvos",
                         target_os = "watchos",
+                        target_os = "visionos",
                         target_os = "freebsd",
                         target_os = "dragonfly",
                         target_os = "openbsd",