about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-05 12:45:04 -0500
committerGitHub <noreply@github.com>2017-02-05 12:45:04 -0500
commitddd01e0d557b64a7e1b04a2aef26901eefcde3d8 (patch)
treeb947c3959ae69c4a372763ceeabc681a2ac0dd91 /src
parent388db666f42f31ce6f7f72a9dd1f737e9b58d443 (diff)
parent3c161393b717c35702c164e5099cc6a34a5ddc80 (diff)
downloadrust-ddd01e0d557b64a7e1b04a2aef26901eefcde3d8.tar.gz
rust-ddd01e0d557b64a7e1b04a2aef26901eefcde3d8.zip
Rollup merge of #39472 - est31:unadjusted_only_for_win, r=nagisa
Don't use "unadjusted" ABI on non windows platforms

We introduced the unadjusted ABI to work around wrong
(buggy) ABI expectations by LLVM on Windows [1].
Therefore, it should be solely used on Windows and not
on other platforms, like right now is the case.

[1]: see this comment for details https://github.com/rust-lang/rust/pull/38482#issuecomment-269074031
Diffstat (limited to 'src')
-rw-r--r--src/libcompiler_builtins/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs
index b2a615456aa..4634301058b 100644
--- a/src/libcompiler_builtins/lib.rs
+++ b/src/libcompiler_builtins/lib.rs
@@ -652,17 +652,17 @@ pub mod reimpls {
         }
 
         #[export_name="__fixunssfti"]
-        pub extern "unadjusted" fn f32_as_u128(a: f32) -> u128 {
+        pub extern $unadj fn f32_as_u128(a: f32) -> u128 {
             float_as_unsigned!(a, f32, u128)
         }
 
         #[export_name="__fixdfti"]
-        pub extern "unadjusted" fn f64_as_i128(a: f64) -> i128 {
+        pub extern $unadj fn f64_as_i128(a: f64) -> i128 {
             float_as_signed!(a, f64, i128)
         }
 
         #[export_name="__fixsfti"]
-        pub extern "unadjusted" fn f32_as_i128(a: f32) -> i128 {
+        pub extern $unadj fn f32_as_i128(a: f32) -> i128 {
             float_as_signed!(a, f32, i128)
         }