aarch64: Exclude FP intrinsics on +nofp or +nosimd (#344)
`AArch64` GCCs exit with an error condition when they encounter any kind of floating point code if the `nofp` and/or `nosimd` compiler flags have been set. Therefore, evaluate if those flags are present and set a boolean that causes any compiler-rt intrinsics that contain floating point source to be excluded for this target. This patch prepares https://github.com/rust-lang/rust/pull/68334
This commit is contained in:
parent
3e6327aa59
commit
43bcb3b59f
53
build.rs
53
build.rs
|
@ -51,7 +51,7 @@ fn main() {
|
||||||
// time). This can probably be removed in the future
|
// time). This can probably be removed in the future
|
||||||
if !target.contains("wasm32") && !target.contains("nvptx") && !target.starts_with("riscv") {
|
if !target.contains("wasm32") && !target.contains("nvptx") && !target.starts_with("riscv") {
|
||||||
#[cfg(feature = "c")]
|
#[cfg(feature = "c")]
|
||||||
c::compile(&llvm_target);
|
c::compile(&llvm_target, &target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,13 +121,28 @@ mod c {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Compile intrinsics from the compiler-rt C source code
|
/// Compile intrinsics from the compiler-rt C source code
|
||||||
pub fn compile(llvm_target: &[&str]) {
|
pub fn compile(llvm_target: &[&str], target: &String) {
|
||||||
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
|
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
|
||||||
let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
|
let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
|
||||||
let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
|
let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
|
||||||
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
|
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
|
||||||
|
let mut consider_float_intrinsics = true;
|
||||||
let cfg = &mut cc::Build::new();
|
let cfg = &mut cc::Build::new();
|
||||||
|
|
||||||
|
// AArch64 GCCs exit with an error condition when they encounter any kind of floating point
|
||||||
|
// code if the `nofp` and/or `nosimd` compiler flags have been set.
|
||||||
|
//
|
||||||
|
// Therefore, evaluate if those flags are present and set a boolean that causes any
|
||||||
|
// compiler-rt intrinsics that contain floating point source to be excluded for this target.
|
||||||
|
if target_arch == "aarch64" {
|
||||||
|
let cflags_key = String::from("CFLAGS_") + &(target.to_owned().replace("-", "_"));
|
||||||
|
if let Ok(cflags_value) = env::var(cflags_key) {
|
||||||
|
if cflags_value.contains("+nofp") || cflags_value.contains("+nosimd") {
|
||||||
|
consider_float_intrinsics = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cfg.warnings(false);
|
cfg.warnings(false);
|
||||||
|
|
||||||
if target_env == "msvc" {
|
if target_env == "msvc" {
|
||||||
|
@ -166,33 +181,38 @@ mod c {
|
||||||
("__cmpdi2", "cmpdi2.c"),
|
("__cmpdi2", "cmpdi2.c"),
|
||||||
("__ctzdi2", "ctzdi2.c"),
|
("__ctzdi2", "ctzdi2.c"),
|
||||||
("__ctzsi2", "ctzsi2.c"),
|
("__ctzsi2", "ctzsi2.c"),
|
||||||
("__divdc3", "divdc3.c"),
|
|
||||||
("__divsc3", "divsc3.c"),
|
|
||||||
("__divxc3", "divxc3.c"),
|
|
||||||
("__extendhfsf2", "extendhfsf2.c"),
|
|
||||||
("__int_util", "int_util.c"),
|
("__int_util", "int_util.c"),
|
||||||
("__muldc3", "muldc3.c"),
|
|
||||||
("__mulsc3", "mulsc3.c"),
|
|
||||||
("__mulvdi3", "mulvdi3.c"),
|
("__mulvdi3", "mulvdi3.c"),
|
||||||
("__mulvsi3", "mulvsi3.c"),
|
("__mulvsi3", "mulvsi3.c"),
|
||||||
("__mulxc3", "mulxc3.c"),
|
|
||||||
("__negdf2", "negdf2.c"),
|
|
||||||
("__negdi2", "negdi2.c"),
|
("__negdi2", "negdi2.c"),
|
||||||
("__negsf2", "negsf2.c"),
|
|
||||||
("__negvdi2", "negvdi2.c"),
|
("__negvdi2", "negvdi2.c"),
|
||||||
("__negvsi2", "negvsi2.c"),
|
("__negvsi2", "negvsi2.c"),
|
||||||
("__paritydi2", "paritydi2.c"),
|
("__paritydi2", "paritydi2.c"),
|
||||||
("__paritysi2", "paritysi2.c"),
|
("__paritysi2", "paritysi2.c"),
|
||||||
("__popcountdi2", "popcountdi2.c"),
|
("__popcountdi2", "popcountdi2.c"),
|
||||||
("__popcountsi2", "popcountsi2.c"),
|
("__popcountsi2", "popcountsi2.c"),
|
||||||
("__powixf2", "powixf2.c"),
|
|
||||||
("__subvdi3", "subvdi3.c"),
|
("__subvdi3", "subvdi3.c"),
|
||||||
("__subvsi3", "subvsi3.c"),
|
("__subvsi3", "subvsi3.c"),
|
||||||
|
("__ucmpdi2", "ucmpdi2.c"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if consider_float_intrinsics {
|
||||||
|
sources.extend(&[
|
||||||
|
("__divdc3", "divdc3.c"),
|
||||||
|
("__divsc3", "divsc3.c"),
|
||||||
|
("__divxc3", "divxc3.c"),
|
||||||
|
("__extendhfsf2", "extendhfsf2.c"),
|
||||||
|
("__muldc3", "muldc3.c"),
|
||||||
|
("__mulsc3", "mulsc3.c"),
|
||||||
|
("__mulxc3", "mulxc3.c"),
|
||||||
|
("__negdf2", "negdf2.c"),
|
||||||
|
("__negsf2", "negsf2.c"),
|
||||||
|
("__powixf2", "powixf2.c"),
|
||||||
("__truncdfhf2", "truncdfhf2.c"),
|
("__truncdfhf2", "truncdfhf2.c"),
|
||||||
("__truncdfsf2", "truncdfsf2.c"),
|
("__truncdfsf2", "truncdfsf2.c"),
|
||||||
("__truncsfhf2", "truncsfhf2.c"),
|
("__truncsfhf2", "truncsfhf2.c"),
|
||||||
("__ucmpdi2", "ucmpdi2.c"),
|
|
||||||
]);
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
// When compiling in rustbuild (the rust-lang/rust repo) this library
|
// When compiling in rustbuild (the rust-lang/rust repo) this library
|
||||||
// also needs to satisfy intrinsics that jemalloc or C in general may
|
// also needs to satisfy intrinsics that jemalloc or C in general may
|
||||||
|
@ -214,12 +234,15 @@ mod c {
|
||||||
("__ffsti2", "ffsti2.c"),
|
("__ffsti2", "ffsti2.c"),
|
||||||
("__mulvti3", "mulvti3.c"),
|
("__mulvti3", "mulvti3.c"),
|
||||||
("__negti2", "negti2.c"),
|
("__negti2", "negti2.c"),
|
||||||
("__negvti2", "negvti2.c"),
|
|
||||||
("__parityti2", "parityti2.c"),
|
("__parityti2", "parityti2.c"),
|
||||||
("__popcountti2", "popcountti2.c"),
|
("__popcountti2", "popcountti2.c"),
|
||||||
("__subvti3", "subvti3.c"),
|
("__subvti3", "subvti3.c"),
|
||||||
("__ucmpti2", "ucmpti2.c"),
|
("__ucmpti2", "ucmpti2.c"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
if consider_float_intrinsics {
|
||||||
|
sources.extend(&[("__negvti2", "negvti2.c")]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if target_vendor == "apple" {
|
if target_vendor == "apple" {
|
||||||
|
@ -372,7 +395,7 @@ mod c {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if target_arch == "aarch64" {
|
if target_arch == "aarch64" && consider_float_intrinsics {
|
||||||
sources.extend(&[
|
sources.extend(&[
|
||||||
("__comparetf2", "comparetf2.c"),
|
("__comparetf2", "comparetf2.c"),
|
||||||
("__extenddftf2", "extenddftf2.c"),
|
("__extenddftf2", "extenddftf2.c"),
|
||||||
|
|
Loading…
Reference in New Issue