Skip to content

arm: Call getauxval through libc. #2535

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
briansmith merged 1 commit into from
May 21, 2025
Merged

arm: Call getauxval through libc. #2535

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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ getrandom = { version = "0.2.10" }
untrusted = { version = "0.9" }

[target.'cfg(all(any(all(target_arch = "aarch64", target_endian = "little"), all(target_arch = "arm", target_endian = "little")), any(target_os = "android", target_os = "linux")))'.dependencies]
libc = { version = "0.2.148", default-features = false }
libc = { version = "0.2.172", default-features = false }

[target.'cfg(all(all(target_arch = "aarch64", target_endian = "little"), target_vendor = "apple", any(target_os = "ios", target_os = "macos", target_os = "tvos", target_os = "visionos", target_os = "watchos")))'.dependencies]
libc = { version = "0.2.155", default-features = false }
libc = { version = "0.2.172", default-features = false }

[target.'cfg(all(all(target_arch = "aarch64", target_endian = "little"), target_os = "windows"))'.dependencies]
windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_System_Threading"] }
Expand All @@ -175,7 +175,7 @@ windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_System_
wasm-bindgen-test = { version = "0.3.37", default-features = false, features = ["std"] }

[target.'cfg(any(unix, windows, target_os = "wasi"))'.dev-dependencies]
libc = { version = "0.2.148", default-features = false }
libc = { version = "0.2.172", default-features = false }

[build-dependencies]
cc = { version = "1.2.8", default-features = false }
Expand Down
10 changes: 1 addition & 9 deletions src/cpu/arm/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,8 @@ pub fn detect_features() -> u32 {
#[cfg(not(target_env = "uclibc"))]
{
use super::CAPS_STATIC;
use libc::{c_ulong, getauxval, AT_HWCAP};

// The `libc` crate doesn't provide this functionality on all
// 32-bit Linux targets, like Android or -musl. Use this polyfill
// for all 32-bit ARM targets so that testing on one of them will
// be more meaningful to the others.
use libc::c_ulong;
extern "C" {
pub fn getauxval(type_: c_ulong) -> c_ulong;
}
const AT_HWCAP: c_ulong = 16;
const HWCAP_NEON: c_ulong = 1 << 12;

if CAPS_STATIC & Neon::mask() != Neon::mask() {
Expand Down
Loading