diff options
| -rw-r--r-- | compiler/main/HscMain.lhs | 5 | ||||
| -rw-r--r-- | rts/Prelude.h | 4 | ||||
| -rw-r--r-- | rts/posix/Signals.c | 2 | ||||
| -rw-r--r-- | rts/win32/ThrIOManager.c | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs index dddee58ec9..c4e5abae3a 100644 --- a/compiler/main/HscMain.lhs +++ b/compiler/main/HscMain.lhs @@ -774,8 +774,9 @@ hscFileFrontEnd :: ModSummary -> Hsc TcGblEnv hscFileFrontEnd mod_summary = do rdr_module <- hscParse' mod_summary hsc_env <- getHscEnv - {-# SCC "Typecheck-Rename" #-} - tcg_env <- ioMsgMaybe $ + tcg_env <- + {-# SCC "Typecheck-Rename" #-} + ioMsgMaybe $ tcRnModule hsc_env (ms_hsc_src mod_summary) False rdr_module dflags <- getDynFlags -- XXX: See Note [SafeHaskell API] diff --git a/rts/Prelude.h b/rts/Prelude.h index 7b46063356..e32980e0d0 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -44,7 +44,7 @@ PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure); PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure); PRELUDE_CLOSURE(base_GHCziConcziSyncziImp_runSparks_closure); -PRELUDE_CLOSURE(base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure); +PRELUDE_CLOSURE(base_GHCziConcziIO_ensureIOManagerIsRunning_closure); PRELUDE_CLOSURE(base_GHCziConcziSignal_runHandlers_closure); PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_static_info); @@ -89,7 +89,7 @@ PRELUDE_INFO(base_GHCziStableziImp_StablePtr_con_info); #define mainIO_closure (&ZCMain_main_closure) #define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSyncziImp_runSparks_closure) -#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure) +#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ensureIOManagerIsRunning_closure) #define runHandlers_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure) #define stackOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOziException_stackOverflow_closure) diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c index 5df7034cc2..9f5bf9f370 100644 --- a/rts/posix/Signals.c +++ b/rts/posix/Signals.c @@ -149,7 +149,7 @@ Capability * ioManagerStartCap (Capability *cap) { return rts_evalIO( - cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL); + cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL); } void diff --git a/rts/win32/ThrIOManager.c b/rts/win32/ThrIOManager.c index 13c8153770..f48b20387e 100644 --- a/rts/win32/ThrIOManager.c +++ b/rts/win32/ThrIOManager.c @@ -153,9 +153,9 @@ ioManagerStart (void) if (io_manager_event == INVALID_HANDLE_VALUE) {
cap = rts_lock();
#if defined(mingw32_HOST_OS) && defined(__PIC__)
- rts_evalIO(cap,_imp__base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
+ rts_evalIO(cap,_imp__base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
#else
- rts_evalIO(cap,&base_GHCziConcziIOziImp_ensureIOManagerIsRunning_closure,NULL);
+ rts_evalIO(cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);
#endif
rts_unlock(cap);
}
|