diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-03-23 18:25:57 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-03-23 18:25:57 +0000 |
| commit | fcf6b22d0478be20e27c2245f3e34dd272e12522 (patch) | |
| tree | 7b33e0ecfddef9bd27f963b13e332baca0ae4db4 /rts | |
| parent | 7f0471be1cfe0ef6110ef7fdd8132d85387d0b21 (diff) | |
| download | haskell-fcf6b22d0478be20e27c2245f3e34dd272e12522.tar.gz | |
Follow library changes
Integer, Bool and Unit/Inl/Inr are now in new packages integer
and ghc-prim.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Exception.cmm | 6 | ||||
| -rw-r--r-- | rts/Prelude.h | 8 | ||||
| -rw-r--r-- | rts/package.conf.in | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/rts/Exception.cmm b/rts/Exception.cmm index 39a2abad9a..c2f0dde675 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -14,7 +14,7 @@ #include "RaiseAsync.h" #ifdef __PIC__ -import base_GHCziBase_True_closure; +import ghczmprim_GHCziBool_True_closure; #endif /* ----------------------------------------------------------------------------- @@ -440,8 +440,8 @@ retry_pop_stack: Sp(5) = stg_raise_ret_info; Sp(4) = stg_noforceIO_info; // required for unregisterised Sp(3) = exception; // the AP_STACK - Sp(2) = base_GHCziBase_True_closure; // dummy breakpoint info - Sp(1) = base_GHCziBase_True_closure; // True <=> a breakpoint + Sp(2) = ghczmprim_GHCziBool_True_closure; // dummy breakpoint info + Sp(1) = ghczmprim_GHCziBool_True_closure; // True <=> a breakpoint R1 = ioAction; jump RET_LBL(stg_ap_pppv); } diff --git a/rts/Prelude.h b/rts/Prelude.h index 31fe136d36..f237e59bea 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -24,8 +24,8 @@ * modules these names are defined in. */ -PRELUDE_CLOSURE(base_GHCziBase_True_closure); -PRELUDE_CLOSURE(base_GHCziBase_False_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziBool_True_closure); +PRELUDE_CLOSURE(ghczmprim_GHCziBool_False_closure); PRELUDE_CLOSURE(base_GHCziPack_unpackCString_closure); PRELUDE_CLOSURE(base_GHCziWeak_runFinalizzerBatch_closure); @@ -79,8 +79,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(base_GHCziBase_True_closure) -#define False_closure DLL_IMPORT_DATA_REF(base_GHCziBase_False_closure) +#define True_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_True_closure) +#define False_closure DLL_IMPORT_DATA_REF(ghczmprim_GHCziBool_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/package.conf.in b/rts/package.conf.in index f73e6b1421..1642101ba0 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -101,8 +101,8 @@ ld-options: , "-u", "_base_GHCziPtr_Ptr_con_info" , "-u", "_base_GHCziPtr_FunPtr_con_info" , "-u", "_base_GHCziStable_StablePtr_con_info" - , "-u", "_base_GHCziBase_False_closure" - , "-u", "_base_GHCziBase_True_closure" + , "-u", "_ghczmprim_GHCziBool_False_closure" + , "-u", "_ghczmprim_GHCziBool_True_closure" , "-u", "_base_GHCziPack_unpackCString_closure" , "-u", "_base_GHCziIOBase_stackOverflow_closure" , "-u", "_base_GHCziIOBase_heapOverflow_closure" @@ -135,8 +135,8 @@ ld-options: , "-u", "base_GHCziPtr_Ptr_con_info" , "-u", "base_GHCziPtr_FunPtr_con_info" , "-u", "base_GHCziStable_StablePtr_con_info" - , "-u", "base_GHCziBase_False_closure" - , "-u", "base_GHCziBase_True_closure" + , "-u", "ghczmprim_GHCziBool_False_closure" + , "-u", "ghczmprim_GHCziBool_True_closure" , "-u", "base_GHCziPack_unpackCString_closure" , "-u", "base_GHCziIOBase_stackOverflow_closure" , "-u", "base_GHCziIOBase_heapOverflow_closure" |