From e3ac57b2343b56389d6f6eb8be1767f30b883f03 Mon Sep 17 00:00:00 2001 From: Yu Ding Date: Mon, 6 Aug 2018 20:54:48 -0700 Subject: [PATCH 1/2] Fix symbol collision caused by floatdisf [PR #234](https://github.com/rust-lang-nursery/compiler-builtins/pull/234) added floatdisf implementation in rust and removed floatdisf.c from build.rs. However the removal is in-complete. In x86_64+!msvc environment, the symbol floatdisf would be generated twice. Bugs found in Redox OS issue [#1195](https://gitlab.redox-os.org/redox-os/redox/issues/1195) and Mesalink travis [log](https://travis-ci.org/mesalock-linux/mesalink/jobs/412928048) at line 738. This patch fixes it by removing floatdisf.c from this environment. Signed-off-by: Yu Ding --- library/compiler-builtins/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs index cdcbfe24cd73..d06c1191f3ed 100644 --- a/library/compiler-builtins/build.rs +++ b/library/compiler-builtins/build.rs @@ -267,7 +267,6 @@ mod c { if target_arch == "x86_64" { sources.extend( &[ - "x86_64/floatdisf.c", "x86_64/floatdixf.c", "x86_64/floatundidf.S", "x86_64/floatundisf.S", From 0e67871a430062619951e72c92b9d2735c3449cc Mon Sep 17 00:00:00 2001 From: Yu Ding Date: Mon, 6 Aug 2018 23:03:37 -0700 Subject: [PATCH 2/2] Follow up on PR #252 --- library/compiler-builtins/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs index d06c1191f3ed..fba4091124a9 100644 --- a/library/compiler-builtins/build.rs +++ b/library/compiler-builtins/build.rs @@ -269,7 +269,6 @@ mod c { &[ "x86_64/floatdixf.c", "x86_64/floatundidf.S", - "x86_64/floatundisf.S", "x86_64/floatundixf.S", ], );