diff options
| author | LemonBoy <thatlemon@gmail.com> | 2019-10-09 22:07:05 +0200 |
|---|---|---|
| committer | LemonBoy <thatlemon@gmail.com> | 2019-10-09 22:44:36 +0200 |
| commit | 9ae293ae3bda918280a9ee254685ec9468e7d141 (patch) | |
| tree | 0963a93fc056a767fc3e73a6abb71678782684be /lib | |
| parent | f83bb3dd9e68899ca39cdddb7d84c2ad1c833d55 (diff) | |
| download | zig-9ae293ae3bda918280a9ee254685ec9468e7d141.tar.gz zig-9ae293ae3bda918280a9ee254685ec9468e7d141.zip | |
Remove x86/Windows name mangling hack
Let's fix this properly by generating the correct lib files from the
mingw sources.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/special/compiler_rt.zig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/std/special/compiler_rt.zig b/lib/std/special/compiler_rt.zig index ec703afc9f..88e3078d6a 100644 --- a/lib/std/special/compiler_rt.zig +++ b/lib/std/special/compiler_rt.zig @@ -250,10 +250,12 @@ comptime { switch (builtin.arch) { .i386 => { - @export("_alldiv", @import("compiler_rt/aulldiv.zig")._alldiv, strong_linkage); - @export("_aulldiv", @import("compiler_rt/aulldiv.zig")._aulldiv, strong_linkage); - @export("_allrem", @import("compiler_rt/aullrem.zig")._allrem, strong_linkage); - @export("_aullrem", @import("compiler_rt/aullrem.zig")._aullrem, strong_linkage); + // Don't let LLVM apply the stdcall name mangling on those MSVC + // builtin functions + @export("\x01__alldiv", @import("compiler_rt/aulldiv.zig")._alldiv, strong_linkage); + @export("\x01__aulldiv", @import("compiler_rt/aulldiv.zig")._aulldiv, strong_linkage); + @export("\x01__allrem", @import("compiler_rt/aullrem.zig")._allrem, strong_linkage); + @export("\x01__aullrem", @import("compiler_rt/aullrem.zig")._aullrem, strong_linkage); @export("__divti3", @import("compiler_rt/divti3.zig").__divti3, linkage); @export("__modti3", @import("compiler_rt/modti3.zig").__modti3, linkage); |