Skip to content

Commit

Permalink
Auto merge of #211 - haellowyyn:fix-multi-definition-of-mulsf3, r=ale…
Browse files Browse the repository at this point in the history
…xcrichton

Remove mulsf3.c and muldf3.c from compiler-rt.

mulsf3 and muldf3 have Rust implementations since 8970485. This PR removes the C implementations to avoid conflicts.

Without this I wasn't able to compile the crate with the "c" feature enabled, the errors being
`multiple definition of '__muldf3'` and `multiple definition of '__mulsf3'`.
  • Loading branch information
bors committed Nov 26, 2017
2 parents 60d949b + 0474060 commit 18feacc
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4987,9 +4987,7 @@ mod c {
"floatundisf.c",
"int_util.c",
"muldc3.c",
"muldf3.c",
"mulsc3.c",
"mulsf3.c",
"mulvdi3.c",
"mulvsi3.c",
"mulxc3.c",
Expand Down

0 comments on commit 18feacc

Please sign in to comment.