Skip to content

chacha20: remove chacha20_force_neon cfg attribute #361

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 2 commits into from
Jun 17, 2024
Merged

chacha20: remove chacha20_force_neon cfg attribute #361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95fbf1
chacha20: remove `chacha20_force_neon` cfg attribute
tarcieri Jun 17, 2024
463cc7a
Remove chacha20_force_neon from CI config
tarcieri Jun 17, 2024
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
2 changes: 1 addition & 1 deletion chacha20/src/backends.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cfg_if! {
pub(crate) mod sse2;
}
}
} else if #[cfg(all(chacha20_force_neon, target_arch = "aarch64", target_feature = "neon"))] {
} else if #[cfg(all(target_arch = "aarch64", target_feature = "neon"))] {
pub(crate) mod neon;
} else {
pub(crate) mod soft;
Expand Down
4 changes: 1 addition & 3 deletions chacha20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@
//!
//! - `chacha20_force_avx2`: force AVX2 backend on x86/x86_64 targets.
//! Requires enabled AVX2 target feature. Ignored on non-x86(-64) targets.
//! - `chacha20_force_neon`: force NEON backend on ARM targets.
//! Requires enabled NEON target feature. Ignored on non-ARM targets. Nightly-only.
//! - `chacha20_force_soft`: force software backend.
//! - `chacha20_force_sse2`: force SSE2 backend on x86/x86_64 targets.
//! Requires enabled SSE2 target feature. Ignored on non-x86(-64) targets.
Expand Down Expand Up @@ -317,7 +315,7 @@ impl<R: Rounds, V: Variant> StreamCipherCore for ChaChaCore<R, V> {
}
}
}
} else if #[cfg(all(chacha20_force_neon, target_arch = "aarch64", target_feature = "neon"))] {
} else if #[cfg(all(target_arch = "aarch64", target_feature = "neon"))] {
unsafe {
backends::neon::inner::<R, _>(&mut self.state, f);
}
Expand Down
2 changes: 1 addition & 1 deletion chacha20/src/rng.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ impl<R: Rounds, V: Variant> ChaChaCore<R, V> {
}
}
}
} else if #[cfg(all(chacha20_force_neon, target_arch = "aarch64", target_feature = "neon"))] {
} else if #[cfg(all(target_arch = "aarch64", target_feature = "neon"))] {
unsafe {
backends::neon::rng_inner::<R, V>(self, buffer);
}
Expand Down