From 065aaa914489eb8706a0dea60a2cd2a8a45c265b Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Mon, 8 Aug 2016 08:27:22 +0100
Subject: [PATCH] Remove the x86-specific floating-point builtins

---
 README.md     | 25 ++++++++++++++-----------
 src/lib.rs    |  3 ---
 src/x86_64.rs |  9 ---------
 3 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 src/x86_64.rs

diff --git a/README.md b/README.md
index a08f4d2..c688829 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,9 @@ See [rust-lang/rust#35437][0].
 - [ ] arm/aeabi_fcmp.S
 - [ ] arm/aeabi_idivmod.S
 - [ ] arm/aeabi_ldivmod.S
+- [x] arm/aeabi_memcpy.S
+- [x] arm/aeabi_memmove.S
+- [x] arm/aeabi_memset.S
 - [ ] arm/aeabi_uidivmod.S
 - [ ] arm/aeabi_uldivmod.S
 - [ ] arm/divdf3vfp.S
@@ -115,10 +118,6 @@ See [rust-lang/rust#35437][0].
 - [ ] i386/chkstk.S
 - [ ] i386/chkstk2.S
 - [ ] i386/divdi3.S
-- [ ] i386/floatdidf.S
-- [ ] i386/floatdisf.S
-- [ ] i386/floatundidf.S
-- [ ] i386/floatundisf.S
 - [ ] i386/lshrdi3.S
 - [ ] i386/moddi3.S
 - [ ] i386/muldi3.S
@@ -151,13 +150,6 @@ See [rust-lang/rust#35437][0].
 - [ ] umodti3.c
 - [ ] x86_64/chkstk.S
 - [ ] x86_64/chkstk2.S
-- [ ] x86_64/floatundidf.S
-- [ ] x86_64/floatundisf.S
-- [x] arm/aeabi_memcpy.S
-- [x] arm/aeabi_memmove.S
-- [x] arm/aeabi_memset.S
-- [x] x86_64/floatdidf.c
-- [x] x86_64/floatdisf.c
 
 ## Unimplemented functions
 
@@ -325,6 +317,17 @@ Miscellaneous functionality that is not used by Rust.
 - ~~gcc_personality_v0.c~~
 - ~~trampoline_setup.c~~
 
+Floating-point implementations of builtins that are only called from soft-float code. It would be better to simply use the generic soft-float versions in this case.
+
+- ~~i386/floatdidf.S~~
+- ~~i386/floatdisf.S~~
+- ~~i386/floatundidf.S~~
+- ~~i386/floatundisf.S~~
+- ~~x86_64/floatundidf.S~~
+- ~~x86_64/floatundisf.S~~
+- ~~x86_64/floatdidf.c~~
+- ~~x86_64/floatdisf.c~~
+
 ## License
 
 Licensed under either of
diff --git a/src/lib.rs b/src/lib.rs
index 838e62a..01aca76 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,9 +14,6 @@ use core::mem;
 #[cfg(target_arch = "arm")]
 pub mod arm;
 
-#[cfg(target_arch = "x86_64")]
-pub mod x86_64;
-
 #[cfg(test)]
 mod test;
 
diff --git a/src/x86_64.rs b/src/x86_64.rs
deleted file mode 100644
index d4ea0f7..0000000
--- a/src/x86_64.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[no_mangle]
-pub extern "C" fn __floatdisf(x: i64) -> f32 {
-    x as f32
-}
-
-#[no_mangle]
-pub extern "C" fn __floatdidf(x: i64) -> f64 {
-    x as f64
-}