Skip to content

Fix symbol collision caused by floatdisf #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 7, 2018
Merged

Fix symbol collision caused by floatdisf #252

merged 2 commits into from
Aug 7, 2018

Conversation

dingelish
Copy link
Contributor

PR #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. Build failures occured in Redox OS issue #1195 and Mesalink travis log at line 738. This patch fixes it by removing floatdisf.c from this environment.

Signed-off-by: Yu Ding [email protected]

[PR #234](#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 <[email protected]>
@dingelish
Copy link
Contributor Author

dingelish commented Aug 7, 2018

Not sure if floatundisf.S should be removed as well. Please advise.

@alexcrichton
Copy link
Member

Thanks! And yeah want to remove floatundisf.S as well?

@dingelish
Copy link
Contributor Author

Thanks for your confirmation! Not sure if removal of floatundisf.S is correct. Let's see if the second patch could pass the tests.

@dingelish
Copy link
Contributor Author

Seems to be fine!

@alexcrichton alexcrichton merged commit 5b05a98 into rust-lang:master Aug 7, 2018
@alexcrichton
Copy link
Member

💯

alexcrichton added a commit that referenced this pull request Sep 4, 2018
This was an accidental regression introduced in #252 by removing compilation of
C files without adjusting the `#[use_c_shim_if]` directives. This restores the
compilation of the assembly files and updates the `#[use_c_shim_if]` directives.
tgross35 pushed a commit to tgross35/compiler-builtins that referenced this pull request Feb 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants