Skip to content

Enable MacOS support for GenMC mode. #4571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enable MacOS support for GenMC mode. #4571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion doc/genmc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions src/concurrency/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)),
Expand Down
4 changes: 2 additions & 2 deletions tests/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading