diff options
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Exception.cmm | 6 | ||||
| -rw-r--r-- | rts/Prelude.h | 8 | ||||
| -rw-r--r-- | rts/PrimOps.cmm | 6 | ||||
| -rw-r--r-- | rts/package.conf.in | 8 | ||||
| -rw-r--r-- | rts/win32/libHSghc-prim.def | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/rts/Exception.cmm b/rts/Exception.cmm index f85e2e97e5..581dafdf4f 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -13,7 +13,7 @@ #include "Cmm.h" #include "RaiseAsync.h" -import ghczmprim_GHCziBool_True_closure; +import ghczmprim_GHCziTypes_True_closure; /* ----------------------------------------------------------------------------- Exception Primitives @@ -498,8 +498,8 @@ retry_pop_stack: Sp(5) = exception; Sp(4) = stg_raise_ret_info; Sp(3) = exception; // the AP_STACK - Sp(2) = ghczmprim_GHCziBool_True_closure; // dummy breakpoint info - Sp(1) = ghczmprim_GHCziBool_True_closure; // True <=> a breakpoint + Sp(2) = ghczmprim_GHCziTypes_True_closure; // dummy breakpoint info + Sp(1) = ghczmprim_GHCziTypes_True_closure; // True <=> a breakpoint R1 = ioAction; jump RET_LBL(stg_ap_pppv); } diff --git a/rts/Prelude.h b/rts/Prelude.h index 33a91484ca..86bb6099fb 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -24,8 +24,8 @@ * modules these names are defined in. */ -PRELUDE_CLOSURE(ghczmprim_GHCziBool_True_closure); -PRELUDE_CLOSURE(ghczmprim_GHCziBool_False_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziTypes_True_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziTypes_False_closure); PRELUDE_CLOSURE(base_GHCziPack_unpackCString_closure); PRELUDE_CLOSURE(base_GHCziWeak_runFinalizzerBatch_closure); @@ -82,8 +82,8 @@ PRELUDE_INFO(base_GHCziWord_W64zh_con_info); PRELUDE_INFO(base_GHCziStable_StablePtr_static_info); PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); -#define True_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_True_closure) -#define False_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_False_closure) +#define True_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_True_closure) +#define False_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_False_closure) #define unpackCString_closure DLL_IMPORT_DATA_REF(base_GHCziPack_unpackCString_closure) #define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(base_GHCziWeak_runFinalizzerBatch_closure) #define mainIO_closure (&ZCMain_main_closure) diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 1cc9544e06..4c41df71f2 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -34,7 +34,7 @@ import pthread_mutex_unlock; import base_ControlziExceptionziBase_nestedAtomically_closure; import EnterCriticalSection; import LeaveCriticalSection; -import ghczmprim_GHCziBool_False_closure; +import ghczmprim_GHCziTypes_False_closure; #if !defined(mingw32_HOST_OS) import sm_mutex; #endif @@ -2014,13 +2014,13 @@ stg_getSparkzh W_ spark; #ifndef THREADED_RTS - RET_NP(0,ghczmprim_GHCziBool_False_closure); + RET_NP(0,ghczmprim_GHCziTypes_False_closure); #else (spark) = foreign "C" findSpark(MyCapability()); if (spark != 0) { RET_NP(1,spark); } else { - RET_NP(0,ghczmprim_GHCziBool_False_closure); + RET_NP(0,ghczmprim_GHCziTypes_False_closure); } #endif } diff --git a/rts/package.conf.in b/rts/package.conf.in index ab5a7238ed..0cc63133fd 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -83,8 +83,8 @@ ld-options: , "-u", "_base_GHCziPtr_Ptr_con_info" , "-u", "_base_GHCziPtr_FunPtr_con_info" , "-u", "_base_GHCziStable_StablePtr_con_info" - , "-u", "_ghczmprim_GHCziBool_False_closure" - , "-u", "_ghczmprim_GHCziBool_True_closure" + , "-u", "_ghczmprim_GHCziTypes_False_closure" + , "-u", "_ghczmprim_GHCziTypes_True_closure" , "-u", "_base_GHCziPack_unpackCString_closure" , "-u", "_base_GHCziIOziException_stackOverflow_closure" , "-u", "_base_GHCziIOziException_heapOverflow_closure" @@ -121,8 +121,8 @@ ld-options: , "-u", "base_GHCziPtr_Ptr_con_info" , "-u", "base_GHCziPtr_FunPtr_con_info" , "-u", "base_GHCziStable_StablePtr_con_info" - , "-u", "ghczmprim_GHCziBool_False_closure" - , "-u", "ghczmprim_GHCziBool_True_closure" + , "-u", "ghczmprim_GHCziTypes_False_closure" + , "-u", "ghczmprim_GHCziTypes_True_closure" , "-u", "base_GHCziPack_unpackCString_closure" , "-u", "base_GHCziIOziException_stackOverflow_closure" , "-u", "base_GHCziIOziException_heapOverflow_closure" diff --git a/rts/win32/libHSghc-prim.def b/rts/win32/libHSghc-prim.def index b1285cc9d1..5146bd9791 100644 --- a/rts/win32/libHSghc-prim.def +++ b/rts/win32/libHSghc-prim.def @@ -3,8 +3,8 @@ LIBRARY "libHSghc-prim-@LibVersion@-ghc@ProjectVersion@.dll" EXPORTS - ghczmprim_GHCziBool_True_closure - ghczmprim_GHCziBool_False_closure + ghczmprim_GHCziTypes_True_closure + ghczmprim_GHCziTypes_False_closure ghczmprim_GHCziTypes_Czh_con_info ghczmprim_GHCziTypes_Izh_con_info ghczmprim_GHCziTypes_Fzh_con_info |