diff options
| author | Ross Paterson <ross@soi.city.ac.uk> | 2008-08-12 12:20:48 +0000 |
|---|---|---|
| committer | Ross Paterson <ross@soi.city.ac.uk> | 2008-08-12 12:20:48 +0000 |
| commit | 2378b2325df64a5ccc5b2e038ac3dbb848dea5f7 (patch) | |
| tree | f9d518e3c548e268d04c698c65eec796d4e8c971 /rts | |
| parent | 83256c875683894a93cf4468947ccf11c65577ca (diff) | |
| download | haskell-2378b2325df64a5ccc5b2e038ac3dbb848dea5f7.tar.gz | |
get exception names from Control.Exception.Base instead of Control.Exception
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Prelude.h | 8 | ||||
| -rw-r--r-- | rts/PrimOps.cmm | 4 | ||||
| -rw-r--r-- | rts/package.conf.in | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/rts/Prelude.h b/rts/Prelude.h index 2cd998eeaf..9b27d2f3d4 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -39,8 +39,8 @@ PRELUDE_CLOSURE(base_GHCziIOBase_stackOverflow_closure); PRELUDE_CLOSURE(base_GHCziIOBase_heapOverflow_closure); PRELUDE_CLOSURE(base_GHCziIOBase_BlockedOnDeadMVar_closure); PRELUDE_CLOSURE(base_GHCziIOBase_BlockedIndefinitely_closure); -PRELUDE_CLOSURE(base_ControlziException_nonTermination_closure); -PRELUDE_CLOSURE(base_ControlziException_nestedAtomically_closure); +PRELUDE_CLOSURE(base_ControlziExceptionziBase_nonTermination_closure); +PRELUDE_CLOSURE(base_ControlziExceptionziBase_nestedAtomically_closure); PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure); @@ -89,8 +89,8 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info); #define heapOverflow_closure DLL_IMPORT_DATA_REF(base_GHCziIOBase_heapOverflow_closure) #define BlockedOnDeadMVar_closure DLL_IMPORT_DATA_REF(base_GHCziIOBase_BlockedOnDeadMVar_closure) #define BlockedIndefinitely_closure DLL_IMPORT_DATA_REF(base_GHCziIOBase_BlockedIndefinitely_closure) -#define nonTermination_closure DLL_IMPORT_DATA_REF(base_ControlziException_nonTermination_closure) -#define NestedAtomically_closure DLL_IMPORT_DATA_REF(base_ControlziException_nestedAtomically_closure) +#define nonTermination_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nonTermination_closure) +#define NestedAtomically_closure DLL_IMPORT_DATA_REF(base_ControlziExceptionziBase_nestedAtomically_closure) #define Czh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Czh_static_info) #define Fzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Fzh_static_info) diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index b8d8ccc5a9..f2ce41551a 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -49,7 +49,7 @@ import __gmpz_com; import pthread_mutex_lock; import pthread_mutex_unlock; #endif -import base_ControlziException_nestedAtomically_closure; +import base_ControlziExceptionziBase_nestedAtomically_closure; import EnterCriticalSection; import LeaveCriticalSection; @@ -1251,7 +1251,7 @@ atomicallyzh_fast /* Nested transactions are not allowed; raise an exception */ if (old_trec != NO_TREC) { - R1 = base_ControlziException_nestedAtomically_closure; + R1 = base_ControlziExceptionziBase_nestedAtomically_closure; jump raisezh_fast; } diff --git a/rts/package.conf.in b/rts/package.conf.in index 9022d11a43..bac7883fe9 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -105,11 +105,11 @@ ld-options: , "-u", "_base_GHCziPack_unpackCString_closure" , "-u", "_base_GHCziIOBase_stackOverflow_closure" , "-u", "_base_GHCziIOBase_heapOverflow_closure" - , "-u", "_base_ControlziException_nonTermination_closure" + , "-u", "_base_ControlziExceptionziBase_nonTermination_closure" , "-u", "_base_GHCziIOBase_BlockedOnDeadMVar_closure" , "-u", "_base_GHCziIOBase_BlockedIndefinitely_closure" , "-u", "_base_GHCziIOBase_Deadlock_closure" - , "-u", "_base_ControlziException_nestedAtomically_closure" + , "-u", "_base_ControlziExceptionziBase_nestedAtomically_closure" , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure" #else "-u", "ghczmprim_GHCziTypes_Izh_static_info" @@ -139,11 +139,11 @@ ld-options: , "-u", "base_GHCziPack_unpackCString_closure" , "-u", "base_GHCziIOBase_stackOverflow_closure" , "-u", "base_GHCziIOBase_heapOverflow_closure" - , "-u", "base_ControlziException_nonTermination_closure" + , "-u", "base_ControlziExceptionziBase_nonTermination_closure" , "-u", "base_GHCziIOBase_BlockedOnDeadMVar_closure" , "-u", "base_GHCziIOBase_BlockedIndefinitely_closure" , "-u", "base_GHCziIOBase_Deadlock_closure" - , "-u", "base_ControlziException_nestedAtomically_closure" + , "-u", "base_ControlziExceptionziBase_nestedAtomically_closure" , "-u", "base_GHCziWeak_runFinalizzerBatch_closure" #endif |