From 6c0364064604d1a3a7755339e7ea81bbea53c005 Mon Sep 17 00:00:00 2001
From: Jethro Beekman <jethro@fortanix.com>
Date: Wed, 21 Nov 2018 14:16:00 +0530
Subject: [PATCH] Update compiler_builtins and remove wasm f32<->f64 math
 conversions

---
 src/libcompiler_builtins     |  2 +-
 src/libstd/sys/wasm/cmath.rs | 81 +++++++-----------------------------
 2 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
index fe74674f6e4..10f4f35f967 160000
--- a/src/libcompiler_builtins
+++ b/src/libcompiler_builtins
@@ -1 +1 @@
-Subproject commit fe74674f6e4be76d47b66f67d529ebf4186f4eb1
+Subproject commit 10f4f35f9670bb29715a8c1ec01284852d47ed35
diff --git a/src/libstd/sys/wasm/cmath.rs b/src/libstd/sys/wasm/cmath.rs
index 64fc14d42d9..d4f8d66ee3e 100644
--- a/src/libstd/sys/wasm/cmath.rs
+++ b/src/libstd/sys/wasm/cmath.rs
@@ -8,85 +8,32 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[inline]
-pub unsafe fn cbrtf(n: f32) -> f32 {
-    f64::cbrt(n as f64) as f32
-}
-
-#[inline]
-pub unsafe fn expm1f(n: f32) -> f32 {
-    f64::exp_m1(n as f64) as f32
-}
-
-#[inline]
-#[allow(deprecated)]
-pub unsafe fn fdimf(a: f32, b: f32) -> f32 {
-    f64::abs_sub(a as f64, b as f64) as f32
-}
-
-#[inline]
-pub unsafe fn log1pf(n: f32) -> f32 {
-    f64::ln_1p(n as f64) as f32
-}
-
-#[inline]
-pub unsafe fn hypotf(x: f32, y: f32) -> f32 {
-    f64::hypot(x as f64, y as f64) as f32
-}
-
-#[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
-}
-
 // These symbols are all defined in `compiler-builtins`
 extern {
     pub fn acos(n: f64) -> f64;
+    pub fn acosf(n: f32) -> f32;
     pub fn asin(n: f64) -> f64;
+    pub fn asinf(n: f32) -> f32;
     pub fn atan(n: f64) -> f64;
     pub fn atan2(a: f64, b: f64) -> f64;
+    pub fn atan2f(a: f32, b: f32) -> f32;
+    pub fn atanf(n: f32) -> f32;
     pub fn cbrt(n: f64) -> f64;
+    pub fn cbrtf(n: f32) -> f32;
     pub fn cosh(n: f64) -> f64;
+    pub fn coshf(n: f32) -> f32;
     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;
+    pub fn hypot(x: f64, y: f64) -> f64;
+    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 sinhf(n: f32) -> f32;
     pub fn tan(n: f64) -> f64;
+    pub fn tanf(n: f32) -> f32;
     pub fn tanh(n: f64) -> f64;
-    pub fn hypot(x: f64, y: f64) -> f64;
+    pub fn tanhf(n: f32) -> f32;
 }
-- 
2.44.0