[watchos] Update WatchOs support - add to supported platforms

Author: vladimir-ea

Cargo.lock

@@ -490,9 +490,8 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+version = "1.0.73"
+source = "git+https://github.com/alexcrichton/cc-rs?rev=refs/pull/662/head#73f8fe4b5c0024d855398e4fa4ae68b5b82221f2"
 dependencies = [
  "jobserver",
 ]
@@ -734,8 +733,7 @@ dependencies = [
 [[package]]
 name = "compiler_builtins"
 version = "0.1.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80873f979f0a344a4ade87c2f70d9ccf5720b83b10c97ec7cd745895d021e85a"
+source = "git+https://github.com/rust-lang/compiler-builtins?rev=refs/pull/456/head#eb68e3a2f2a0bd4ea625e4287c2eb2069d1c4fa2"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",
@@ -1965,9 +1963,8 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
+version = "0.2.119"
+source = "git+https://github.com/rust-lang/libc?rev=refs/pull/2717/head#f073685f728891f104bf2125f1bcb9f123cf5d3b"
 dependencies = [
  "rustc-std-workspace-core",
 ]

Cargo.toml

@@ -125,8 +125,11 @@ rustfmt-nightly = { path = "src/tools/rustfmt" }
 # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
 # here
 rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
-cc = { git = "https://github.com/vladimir-ea/cc-rs", branch = "watch_os" }
-libc = { git = "https://github.com/vladimir-ea/libc", branch = "watch_os" }
+
+# TODO prerequisite changes
+compiler_builtins =  { git = "https://github.com/rust-lang/compiler-builtins", rev = "refs/pull/456/head" }
+cc = { git = "https://github.com/alexcrichton/cc-rs", rev = "refs/pull/662/head" }
+libc = { git = "https://github.com/rust-lang/libc", rev = "refs/pull/2717/head" }
 
 # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
 # here

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2475,7 +2475,7 @@ fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
         ("x86_64", "watchos") => "watchsimulator",
         ("arm64_32", "watchos") => "watchos",
         ("aarch64", "watchos") => "watchos",
-        ("armv7k", "watchos") => "watchos",
+        ("arm", "watchos") => "watchos",
         _ => {
             sess.err(&format!("unsupported arch `{}` for os `{}`", arch, os));
             return;
@@ -2533,7 +2533,7 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, String> {
         }
     }
     let res =
-        Command::new("xcrunp").arg("--show-sdk-path").arg("-sdk").arg(sdk_name).output().and_then(
+        Command::new("xcrun").arg("--show-sdk-path").arg("-sdk").arg(sdk_name).output().and_then(
             |output| {
                 if output.status.success() {
                     Ok(String::from_utf8(output.stdout).unwrap())

compiler/rustc_target/src/spec/apple_sdk_base.rs

@@ -18,7 +18,7 @@ pub enum Arch {
 
 fn target_abi(arch: Arch) -> String {
     match arch {
-        Armv7 | Armv7s | Arm64 | I386 | X86_64 => "",
+        Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | X86_64 => "",
         X86_64_macabi | Arm64_macabi => "macabi",
         Arm64_sim => "sim",
     }

compiler/rustc_target/src/spec/arm64_32_apple_watchos.rs

@@ -11,7 +11,6 @@ pub fn target() -> Target {
         options: TargetOptions {
             features: "+neon,+fp-armv8,+apple-a7".to_string(),
             max_atomic_width: Some(64),
-            unsupported_abis: super::arm_base::unsupported_abis(),
             forces_embed_bitcode: true,
             // These arguments are not actually invoked - they just have
             // to look right to pass App Store validation.

compiler/rustc_target/src/spec/armv7k_apple_watchos.rs

@@ -11,7 +11,6 @@ pub fn target() -> Target {
         options: TargetOptions {
             features: "+v7,+vfp4,+neon".to_string(),
             max_atomic_width: Some(64),
-            unsupported_abis: super::arm_base::unsupported_abis(),
             forces_embed_bitcode: true,
             // These arguments are not actually invoked - they just have
             // to look right to pass App Store validation.

compiler/rustc_target/src/spec/x86_64_apple_watchos_sim.rs

@@ -1,5 +1,5 @@
 use super::apple_sdk_base::{opts, Arch};
-use crate::spec::{StackProbeType, Target, TargetOptions};
+use crate::spec::{StackProbeType, Target, TargetOptions, LinkerFlavor, LldFlavor};
 
 pub fn target() -> Target {
     let base = opts("watchos", Arch::X86_64);
@@ -8,9 +8,9 @@ pub fn target() -> Target {
     let llvm_target = super::apple_base::watchos_sim_llvm_target(arch);
 
     Target {
-        llvm_target: llvm_target,
+        llvm_target,
         pointer_width: 64,
-        data_layout: "e-m:o-i64:64-f80:128-n8:16:32:64-S128".to_string(),
+        data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128".to_string(),
         arch: "x86_64".to_string(),
         options: TargetOptions {
             max_atomic_width: Some(64),

library/std/src/sys/unix/fs.rs

@@ -17,6 +17,7 @@ use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
     all(target_os = "linux", target_env = "gnu"),
     target_os = "macos",
     target_os = "ios",
+    target_os = "watchos",
 ))]
 use crate::sys::weak::syscall;
 #[cfg(target_os = "macos")]
@@ -27,6 +28,7 @@ use libc::{c_int, mode_t};
 #[cfg(any(
     target_os = "macos",
     target_os = "ios",
+    target_os = "watchos",
     all(target_os = "linux", target_env = "gnu")
 ))]
 use libc::c_char;
@@ -714,6 +716,7 @@ impl DirEntry {
     #[cfg(not(any(
         target_os = "macos",
         target_os = "ios",
+        target_os = "watchos",
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "freebsd",

library/std/src/sys/unix/locks/pthread_condvar.rs

@@ -95,7 +95,6 @@ impl Condvar {
         target_os = "watchos",
         target_os = "android",
         target_os = "espidf"
-        target_os = "android",
     )))]
     pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
         use crate::mem;
@@ -129,7 +128,6 @@ impl Condvar {
         target_os = "watchos",
         target_os = "android",
         target_os = "espidf"
-        target_os = "android",
     ))]
     pub unsafe fn wait_timeout(&self, mutex: &Mutex, mut dur: Duration) -> bool {
         use crate::ptr;

library/unwind/src/libunwind.rs

@@ -33,7 +33,7 @@ pub const unwinder_private_data_size: usize = 6;
 #[cfg(all(target_arch = "arm", not(any(target_os = "ios", target_os = "watchos"))))]
 pub const unwinder_private_data_size: usize = 20;
 
-#[cfg(all(target_arch = "arm", any(target_os = "ios", target_os = "watchos")))]
+#[cfg(all(any(target_arch = "arm", target_arch="arm64_32"), any(target_os = "ios", target_os = "watchos")))]
 pub const unwinder_private_data_size: usize = 5;
 
 #[cfg(all(target_arch = "aarch64", target_pointer_width = "64"))]