Rodrigo Mesquita pushed to branch wip/T26166 at Glasgow Haskell Compiler / GHC
Commits:
-
fa15c2a3
by Ben Gamari at 2025-10-13T16:46:14+01:00
4 changed files:
- libraries/ghc-internal/include/RtsIfaceSymbols.h
- rts/include/Stg.h
- rts/include/rts/RtsToHsIface.h
- rts/win32/libHSghc-internal.def
Changes:
| ... | ... | @@ -23,7 +23,11 @@ CLOSURE(GHCziInternalziIOziException, cannotCompactMutable_closure) |
| 23 | 23 | CLOSURE(GHCziInternalziControlziExceptionziBase, nonTermination_closure)
|
| 24 | 24 | CLOSURE(GHCziInternalziControlziExceptionziBase, nestedAtomically_closure)
|
| 25 | 25 | CLOSURE(GHCziInternalziControlziExceptionziBase, noMatchingContinuationPrompt_closure)
|
| 26 | +#if defined(mingw32_HOST_OS)
|
|
| 27 | +UNDEF_CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure)
|
|
| 28 | +#else
|
|
| 26 | 29 | CLOSURE(GHCziInternalziEventziThread, blockedOnBadFD_closure)
|
| 30 | +#endif
|
|
| 27 | 31 | CLOSURE(GHCziInternalziConcziSync, runSparks_closure)
|
| 28 | 32 | CLOSURE(GHCziInternalziConcziIO, ensureIOManagerIsRunning_closure)
|
| 29 | 33 | CLOSURE(GHCziInternalziConcziIO, interruptIOManager_closure)
|
| ... | ... | @@ -343,9 +343,12 @@ external prototype return neither of these types to workaround #11395. |
| 343 | 343 | * StgInfoTable, StgClosure and so on.
|
| 344 | 344 | */
|
| 345 | 345 | #include "stg/MiscClosures.h"
|
| 346 | +/* And this is included for references to ghc_hs_iface */
|
|
| 347 | +#include "rts/Types.h"
|
|
| 348 | +#include "rts/RtsToHsIface.h"
|
|
| 346 | 349 | #endif
|
| 347 | 350 | |
| 348 | -#include "stg/Prim.h" /* ghc-internal fallbacks */
|
|
| 351 | +#include "stg/Prim.h"
|
|
| 349 | 352 | #include "stg/SMP.h"
|
| 350 | 353 | |
| 351 | 354 | /* -----------------------------------------------------------------------------
|
| ... | ... | @@ -6,6 +6,8 @@ |
| 6 | 6 | * See Note [RTS/ghc-internal interface].
|
| 7 | 7 | */
|
| 8 | 8 | |
| 9 | +#pragma once
|
|
| 10 | + |
|
| 9 | 11 | typedef struct {
|
| 10 | 12 | StgClosure *processRemoteCompletion_closure; // GHC.Internal.Event.Windows.processRemoteCompletion_closure
|
| 11 | 13 | StgClosure *runIO_closure; // GHC.Internal.TopHandler.runIO_closure
|
| ... | ... | @@ -44,7 +44,6 @@ EXPORTS |
| 44 | 44 | ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure
|
| 45 | 45 | ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure
|
| 46 | 46 | ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure
|
| 47 | - ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure
|
|
| 48 | 47 | ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure
|
| 49 | 48 | ghczminternal_GHCziInternalziExceptionziType_underflowException_closure
|
| 50 | 49 | ghczminternal_GHCziInternalziExceptionziType_overflowException_closure |