diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-04 13:26:38 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-04-07 09:42:42 -0400 |
| commit | 8162b4f329a15b011e2dff055548cb00bdb5c7a0 (patch) | |
| tree | 62e7c831f4a4a079e047f41948e65e9c999bda74 | |
| parent | fcef9a175f810e7bfccbae9bf9e79b2b95da17ab (diff) | |
| download | haskell-8162b4f329a15b011e2dff055548cb00bdb5c7a0.tar.gz | |
rts: Adjust RTS symbol table on Windows for ucrt
| -rw-r--r-- | libraries/ghc-prim/ghc-prim.cabal | 2 | ||||
| -rw-r--r-- | rts/RtsSymbols.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index dbe5d18667..4be29843ae 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -68,7 +68,7 @@ Library -- mingw32 which is required by mingwex. -- user32: provides access to apis to modify user components (UI etc) -- on Windows. Required because of mingw32. - extra-libraries: user32, mingw32, mingwex + extra-libraries: user32, mingw32, mingwex, ucrt if os(linux) -- we need libm, but for musl and other's we might need libc, as libm diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c index 5f97568b62..22484ac522 100644 --- a/rts/RtsSymbols.c +++ b/rts/RtsSymbols.c @@ -162,12 +162,12 @@ extern char **environ; SymI_HasProto(stg_asyncDoProczh) \ SymI_HasProto(rts_InstallConsoleEvent) \ SymI_HasProto(rts_ConsoleHandlerDone) \ + SymI_NeedsProto(__mingw_module_is_dll) \ RTS_WIN32_ONLY(SymI_NeedsProto(___chkstk_ms)) \ RTS_WIN64_ONLY(SymI_NeedsProto(___chkstk_ms)) \ - RTS_WIN32_ONLY(SymI_HasProto(_imp___environ)) \ - RTS_WIN64_ONLY(SymI_HasProto(__imp__environ)) \ - RTS_WIN32_ONLY(SymI_HasProto(_imp___iob)) \ - RTS_WIN64_ONLY(SymI_HasProto(__iob_func)) \ + RTS_WIN64_ONLY(SymI_HasProto(__stdio_common_vswprintf_s)) \ + RTS_WIN64_ONLY(SymI_HasProto(__stdio_common_vswprintf)) \ + RTS_WIN64_ONLY(SymI_HasProto(_errno)) \ /* see Note [Symbols for MinGW's printf] */ \ SymI_HasProto(_lock_file) \ SymI_HasProto(_unlock_file) \ |