Remove the rsix dependency in cranelift-native. (#3395)
Revert the part of 47490b4383 which
changed cranelift-native to use rsix. It's just one call, and this lets
Cranelift users that don't otherwise depend on rsix to avoid it.
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -696,7 +696,7 @@ name = "cranelift-native"
|
||||
version = "0.77.0"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"rsix",
|
||||
"libc",
|
||||
"target-lexicon",
|
||||
]
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ cranelift-codegen = { path = "../codegen", version = "0.77.0", default-features
|
||||
target-lexicon = "0.12"
|
||||
|
||||
[target.'cfg(target_arch = "s390x")'.dependencies]
|
||||
rsix = "0.23.0"
|
||||
libc = "0.2.95"
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
|
||||
@@ -126,7 +126,7 @@ pub fn builder_with_options(
|
||||
}
|
||||
|
||||
// There is no is_s390x_feature_detected macro yet, so for now
|
||||
// we use linux_hwcap from the rsix crate directly.
|
||||
// we use getauxval from the libc crate directly.
|
||||
#[cfg(all(target_arch = "s390x", target_os = "linux"))]
|
||||
{
|
||||
use cranelift_codegen::settings::Configurable;
|
||||
@@ -135,8 +135,8 @@ pub fn builder_with_options(
|
||||
return Ok(isa_builder);
|
||||
}
|
||||
|
||||
let v = rsix::process::linux_hwcap().0;
|
||||
const HWCAP_S390X_VXRS_EXT2: usize = 32768;
|
||||
let v = unsafe { libc::getauxval(libc::AT_HWCAP) };
|
||||
const HWCAP_S390X_VXRS_EXT2: libc::c_ulong = 32768;
|
||||
if (v & HWCAP_S390X_VXRS_EXT2) != 0 {
|
||||
isa_builder.enable("has_vxrs_ext2").unwrap();
|
||||
// There is no separate HWCAP bit for mie2, so assume
|
||||
|
||||
Reference in New Issue
Block a user