Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ jobs:
- target: arm-unknown-linux-gnueabi
host_os: ubuntu-22.04

# - target: arm64_32-apple-watchos
# host_os: macos-15
# rust_channel: nightly
# mode: --release
# # TODO: Run in the emulator.
# cargo_options: --no-run -Z build-std
- target: arm64_32-apple-watchos
host_os: macos-15
rust_channel: nightly
mode: --release
# TODO: Run in the emulator.
cargo_options: --no-run -Z build-std

- target: armv7-linux-androideabi
host_os: ubuntu-22.04
Expand Down
1 change: 0 additions & 1 deletion src/cpu/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ mod abi_assumptions {
// every other <64-bit parameter type to the corresponding 64-bit type.
const _ASSUMED_POINTER_SIZE: usize =
if cfg!(all(target_os = "watchos", target_pointer_width = "32")) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest changing this to:

if cfg!(all(target_os = "watchos", target_pointer_width = "32", feature = "untested-arm64_32-watchos")) {

Then add the feature in Cargo.toml and update the GitHub Actions to add the feeture flag.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, it's our transitive dependency. It's some level down in our dependency tree.

We are currently having an issue running our Rust native code on watchOS device. Could or couldn't be related with this but that's we're gonna focus on right now.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is most likely because I compiled the Rust XCFramework with watchos11.5 SDK that is shipped with the XCode 16.4 that I'm using. But the watchOS app itself targets minimum watchOS 9.6, so there's a missmatch between SDK and runtime target. I'll try compiling the Rust library with XCode 14.3 that includes watchos9.4 SDK that is required for building watchOS app targeting watchOS 9.6.

todo!(); // Need to run tests for this ABI.
#[allow(unreachable_code)]
{
4
Expand Down