Merge branch 'libcore'

1 files changed, 5 insertions, 1 deletions

diff --git a/libcore/intrinsics.rs b/libcore/intrinsics.rs
index 45890cd..dd564b7 100644
--- a/libcore/intrinsics.rs
+++ b/libcore/intrinsics.rs
@@ -428,7 +428,10 @@ extern "rust-intrinsic" {
     pub fn volatile_load<T>(src: *const T) -> T;
     /// Perform a volatile store to the `dst` pointer.
     pub fn volatile_store<T>(dst: *mut T, val: T);
+}
 
+#[cfg(not(disable_float))]
+extern "rust-intrinsic" {
     /// Returns the square root of an `f32`
     pub fn sqrtf32(x: f32) -> f32;
     /// Returns the square root of an `f64`
@@ -545,8 +548,9 @@ extern "rust-intrinsic" {
     /// Float remainder that allows optimizations based on algebraic rules.
     /// May assume inputs are finite.
     pub fn frem_fast<T>(a: T, b: T) -> T;
+}
 
-
+extern "rust-intrinsic" {
     /// Returns the number of bits set in an integer type `T`
     pub fn ctpop<T>(x: T) -> T;