Skip to content

cpubits: better ARMv7 cfg predicate #1431

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

Merged
tarcieri merged 1 commit into from
Jan 23, 2026
Merged

cpubits: better ARMv7 cfg predicate #1431

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
8 changes: 4 additions & 4 deletions cpubits/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
/// certain targets from 32-bit to 64-bit ones.
///
/// This 64-bit promotion occurs if `any` of the following `cfg`s are true:
/// - ARMv7: `all(target_arch = "arm", not(target_feature = "thumb-mode"))`
/// - ARMv7: `all(target_arch = "arm", target_feature = "v7")`
/// - WASM: `target_arch = "wasm32"`
#[macro_export]
macro_rules! cpubits {
Expand Down Expand Up @@ -184,7 +184,7 @@ macro_rules! cpubits {
// `cfg` selector for 64-bit target overrides
#[cfg(enable_64_bit = any(
// ARMv7
all(target_arch = "arm", not(target_feature = "thumb-mode")),
all(target_arch = "arm", target_feature = "v7"),
// WASM
target_arch = "wasm32",
))]
Expand Down Expand Up @@ -321,7 +321,7 @@ mod tests {
// Duplicated 64-bit override predicates need to go here
if cfg!(any(
// ARMv7
all(target_arch = "arm", not(target_feature = "thumb-mode")),
all(target_arch = "arm", target_feature = "v7"),
// WASM
target_arch = "wasm32"
)) {
Expand All @@ -337,7 +337,7 @@ mod tests {
}

/// Explicit test for ARMv7 so we can see the predicate is working
#[cfg(all(target_arch = "arm", not(target_feature = "thumb-mode")))]
#[cfg(all(target_arch = "arm", target_feature = "v7"))]
#[test]
fn cpubits_on_armv7_is_64bit() {
assert_eq!(CPUBITS, 64);
Expand Down