M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use better cfg name for arm-linux tests

This commit is contained in:
Matt Ickstadt 2016-11-12 15:31:19 -06:00
parent 77ca63c511
commit f68475e080
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.rs
View File

@ -424,8 +424,9 @@ fn main() {
} }
// To filter away some flaky test (see src/float/add.rs for details) // To filter away some flaky test (see src/float/add.rs for details)
if llvm_target.last().unwrap().contains("gnueabi") { if llvm_target[0].starts_with("arm") &&
println!("cargo:rustc-cfg=gnueabi") llvm_target.last().unwrap().contains("gnueabi") {
println!("cargo:rustc-cfg=arm_linux")
} }
// To compile intrinsics.rs for thumb targets, where there is no libc // To compile intrinsics.rs for thumb targets, where there is no libc

4
src/float/add.rs
View File

@ -184,11 +184,11 @@ macro_rules! add {
add!(__addsf3: f32); add!(__addsf3: f32);
add!(__adddf3: f64); add!(__adddf3: f64);
// NOTE(cfg) for some reason, on arm-unknown-linux-gnueabi*, our implementation doesn't // NOTE(cfg) for some reason, on arm*-unknown-linux-gnueabi*, our implementation doesn't
// match the output of its gcc_s or compiler-rt counterpart. Until we investigate further, we'll // match the output of its gcc_s or compiler-rt counterpart. Until we investigate further, we'll
// just avoid testing against them on those targets. Do note that our implementation gives the // just avoid testing against them on those targets. Do note that our implementation gives the
// correct answer; gcc_s and compiler-rt are incorrect in this case. // correct answer; gcc_s and compiler-rt are incorrect in this case.
#[cfg(all(test, not(gnueabi)))] #[cfg(all(test, not(arm_linux)))]
mod tests { mod tests {
use core::{f32, f64}; use core::{f32, f64};
use qc::{F32, F64}; use qc::{F32, F64};