diff --git a/Cargo.toml b/Cargo.toml index 12123c260d..9cba485343 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,8 +48,8 @@ nix = { version = "0.30.1", features = ["mman", "ptrace", "signal"], optional = ipc-channel = { version = "0.20.0", optional = true } capstone = { version = "0.13", optional = true } -# FIXME(genmc,macos): Add `target_os = "macos"` once https://github.com/dtolnay/cxx/issues/1535 is fixed. -[target.'cfg(all(target_os = "linux", target_pointer_width = "64", target_endian = "little"))'.dependencies] +# FIXME(genmc,platform support): Add more platforms when GenMC supports them. +[target.'cfg(all(any(target_os = "linux", target_os = "macos"), target_pointer_width = "64", target_endian = "little"))'.dependencies] genmc-sys = { path = "./genmc-sys/", version = "0.1.0", optional = true } [dev-dependencies] diff --git a/doc/genmc.md b/doc/genmc.md index fdbf2defe4..605cc7cf46 100644 --- a/doc/genmc.md +++ b/doc/genmc.md @@ -47,7 +47,7 @@ Note that `cargo miri test` in GenMC mode is currently not supported. Some or all of these limitations might get removed in the future: - Borrow tracking is currently incompatible (stacked/tree borrows). -- Only Linux is supported for now. +- Only Linux and MacOS are supported for now. - No support for 32-bit or big-endian targets. - No cross-target interpretation. diff --git a/src/concurrency/mod.rs b/src/concurrency/mod.rs index 9dae858592..d162aeda05 100644 --- a/src/concurrency/mod.rs +++ b/src/concurrency/mod.rs @@ -9,11 +9,11 @@ pub mod weak_memory; // Import either the real genmc adapter or a dummy module. // On unsupported platforms, we always include the dummy module, even if the `genmc` feature is enabled. -// FIXME(genmc,macos): Add `target_os = "macos"` once `https://github.com/dtolnay/cxx/issues/1535` is fixed. +// FIXME(genmc,platform support): Add more platforms when GenMC supports them. #[cfg_attr( not(all( feature = "genmc", - target_os = "linux", + any(target_os = "linux", target_os = "macos"), target_pointer_width = "64", target_endian = "little" )), diff --git a/tests/ui.rs b/tests/ui.rs index b7286d9a36..55e4c3f31a 100644 --- a/tests/ui.rs +++ b/tests/ui.rs @@ -341,11 +341,11 @@ fn main() -> Result<()> { } // We only enable GenMC tests when the `genmc` feature is enabled, but also only on platforms we support: - // FIXME(genmc,macos): Add `target_os = "macos"` once `https://github.com/dtolnay/cxx/issues/1535` is fixed. + // FIXME(genmc,platform support): Add more platforms when GenMC supports them. // FIXME(genmc,cross-platform): remove `host == target` check once cross-platform support with GenMC is possible. if cfg!(all( feature = "genmc", - target_os = "linux", + any(target_os = "linux", target_os = "macos"), target_pointer_width = "64", target_endian = "little" )) && host == target