diff options
| author | Jorge Aparicio <jorge.aparicio@ferrous-systems.com> | 2020-01-20 07:50:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 07:50:32 +0000 |
| commit | a3a077610028c773bffc7a74e6a15faa10d2360d (patch) | |
| tree | 819cf353c019f421d80d9545aa18583841c34348 /src/libstd/sys | |
| parent | 470cdf54ac9acee20ab8da46ef7899bae9f58f29 (diff) | |
| parent | 29b854fb741809c29764e33fc17c32ba9c6523ba (diff) | |
| download | rust-a3a077610028c773bffc7a74e6a15faa10d2360d.tar.gz rust-a3a077610028c773bffc7a74e6a15faa10d2360d.zip | |
Merge branch 'master' into bare-metal-cortex-a
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/cmath.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/sys/windows/cmath.rs b/src/libstd/sys/windows/cmath.rs index 6f5d40b494f..1a5421facd0 100644 --- a/src/libstd/sys/windows/cmath.rs +++ b/src/libstd/sys/windows/cmath.rs @@ -27,7 +27,7 @@ extern "C" { pub use self::shims::*; -#[cfg(not(target_env = "msvc"))] +#[cfg(not(all(target_env = "msvc", target_arch = "x86")))] mod shims { use libc::c_float; @@ -43,10 +43,10 @@ mod shims { } } -// On MSVC these functions aren't defined, so we just define shims which promote -// everything fo f64, perform the calculation, and then demote back to f32. -// While not precisely correct should be "correct enough" for now. -#[cfg(target_env = "msvc")] +// On 32-bit x86 MSVC these functions aren't defined, so we just define shims +// which promote everything fo f64, perform the calculation, and then demote +// back to f32. While not precisely correct should be "correct enough" for now. +#[cfg(all(target_env = "msvc", target_arch = "x86"))] mod shims { use libc::c_float; |