-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #120740 - ChrisDenton:cmaths, r=Mark-Simulacrum
Make cmath.rs a single file It makes sense to have this all in one file. There's essentially only one target that has missing symbols and that's easy enough to handle inline. Note that the Windows definitions used to use `c_float` and `c_double` whereas the other platforms all used `f32` and `f64`. They've now been made consistent. However, `c_float` and `c_double` have the expected definitions on all Windows platforms we support.
- Loading branch information
Showing
4 changed files
with
88 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
#![cfg(not(test))] | ||
|
||
// These symbols are all defined by `libm`, | ||
// or by `compiler-builtins` on unsupported platforms. | ||
extern "C" { | ||
pub fn acos(n: f64) -> f64; | ||
pub fn asin(n: f64) -> f64; | ||
pub fn atan(n: f64) -> f64; | ||
pub fn atan2(a: f64, b: f64) -> f64; | ||
pub fn cbrt(n: f64) -> f64; | ||
pub fn cbrtf(n: f32) -> f32; | ||
pub fn cosh(n: f64) -> f64; | ||
pub fn expm1(n: f64) -> f64; | ||
pub fn expm1f(n: f32) -> f32; | ||
pub fn fdim(a: f64, b: f64) -> f64; | ||
pub fn fdimf(a: f32, b: f32) -> f32; | ||
#[cfg_attr(target_env = "msvc", link_name = "_hypot")] | ||
pub fn hypot(x: f64, y: f64) -> f64; | ||
#[cfg_attr(target_env = "msvc", link_name = "_hypotf")] | ||
pub fn hypotf(x: f32, y: f32) -> f32; | ||
pub fn log1p(n: f64) -> f64; | ||
pub fn log1pf(n: f32) -> f32; | ||
pub fn sinh(n: f64) -> f64; | ||
pub fn tan(n: f64) -> f64; | ||
pub fn tanh(n: f64) -> f64; | ||
pub fn tgamma(n: f64) -> f64; | ||
pub fn tgammaf(n: f32) -> f32; | ||
pub fn lgamma_r(n: f64, s: &mut i32) -> f64; | ||
pub fn lgammaf_r(n: f32, s: &mut i32) -> f32; | ||
|
||
cfg_if::cfg_if! { | ||
if #[cfg(not(all(target_os = "windows", target_env = "msvc", target_arch = "x86")))] { | ||
pub fn acosf(n: f32) -> f32; | ||
pub fn asinf(n: f32) -> f32; | ||
pub fn atan2f(a: f32, b: f32) -> f32; | ||
pub fn atanf(n: f32) -> f32; | ||
pub fn coshf(n: f32) -> f32; | ||
pub fn sinhf(n: f32) -> f32; | ||
pub fn tanf(n: f32) -> f32; | ||
pub fn tanhf(n: f32) -> f32; | ||
}} | ||
} | ||
|
||
// On 32-bit x86 MSVC these functions aren't defined, so we just define shims | ||
// which promote everything to f64, perform the calculation, and then demote | ||
// back to f32. While not precisely correct should be "correct enough" for now. | ||
cfg_if::cfg_if! { | ||
if #[cfg(all(target_os = "windows", target_env = "msvc", target_arch = "x86"))] { | ||
#[inline] | ||
pub unsafe fn acosf(n: f32) -> f32 { | ||
f64::acos(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn asinf(n: f32) -> f32 { | ||
f64::asin(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn atan2f(n: f32, b: f32) -> f32 { | ||
f64::atan2(n as f64, b as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn atanf(n: f32) -> f32 { | ||
f64::atan(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn coshf(n: f32) -> f32 { | ||
f64::cosh(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn sinhf(n: f32) -> f32 { | ||
f64::sinh(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn tanf(n: f32) -> f32 { | ||
f64::tan(n as f64) as f32 | ||
} | ||
|
||
#[inline] | ||
pub unsafe fn tanhf(n: f32) -> f32 { | ||
f64::tanh(n as f64) as f32 | ||
} | ||
}} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.