X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrelude.c;h=21ebc57837bf61c0b7cd5e89f4b5411ed63d6e71;hb=efcd3f2b7aabe23e30ab482db1ed2eee5075e095;hp=d469d8ba13bd10faac052a82d91b27ae17c8b6af;hpb=51464cf3beb83a0976f746f5c7c83381a8112516;p=ghc-hetmet.git diff --git a/ghc/rts/Prelude.c b/ghc/rts/Prelude.c index d469d8b..21ebc57 100644 --- a/ghc/rts/Prelude.c +++ b/ghc/rts/Prelude.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- - * $Id: Prelude.c,v 1.2 2000/03/14 14:34:47 sewardj Exp $ + * $Id: Prelude.c,v 1.6 2000/04/14 16:47:43 panne Exp $ * * (c) The GHC Team, 1998-2000 * @@ -12,13 +12,14 @@ #include "Prelude.h" #if defined(INTERPRETER) -const StgClosure *ind_True_static_closure; -const StgClosure *ind_False_static_closure; +const StgClosure *ind_True_closure; +const StgClosure *ind_False_closure; const StgClosure *ind_unpackCString_closure; const StgClosure *ind_stackOverflow_closure; const StgClosure *ind_heapOverflow_closure; -const StgClosure *ind_PutFullMVar_static_closure; -const StgClosure *ind_NonTermination_static_closure; +const StgClosure *ind_PutFullMVar_closure; +const StgClosure *ind_BlockedOnDeadMVar_closure; +const StgClosure *ind_NonTermination_closure; const StgClosure *ind_mainIO_closure; const StgInfoTable *ind_Czh_static_info; @@ -94,15 +95,17 @@ INFO_TABLE_CONSTR(hugs_standalone_StablePtr_static_info,Hugs_CONSTR_entry, */ void fixupRTStoPreludeRefs ( void*(*ask_hugs_dynamic_linker)(char*) ) { + (void)ask_hugs_dynamic_linker; /* keep gcc -Wall happy */ #if defined(INTERPRETER) if (ask_hugs_dynamic_linker == NULL) { /* Hugs standalone mode. */ - ind_True_static_closure = NULL; /* True_static_closure; */ - ind_False_static_closure = NULL; /* False_static_closure; */ - ind_PutFullMVar_static_closure = NULL; /* PutFullMVar_static_closure; */ - ind_NonTermination_static_closure = NULL; /* NonTermination_static_closure; */ - ind_unpackCString_closure = NULL; /* unpackCString_closure; */ + ind_True_closure = NULL; /* True__closure; */ + ind_False_closure = NULL; /* False_closure; */ + ind_PutFullMVar_closure = NULL; /* PutFullMVar_closure; */ + ind_BlockedOnDeadMVar_closure = NULL; /* BlockedOnDeadMVar_closure; */ + ind_NonTermination_closure = NULL; /* NonTermination_closure; */ + ind_unpackCString_closure = NULL; /* unpackCString_closure; */ ind_stackOverflow_closure = stackOverflow_closure; ind_heapOverflow_closure = heapOverflow_closure; @@ -129,14 +132,16 @@ void fixupRTStoPreludeRefs ( void*(*ask_hugs_dynamic_linker)(char*) ) /* Hugs combined mode. */ void*(*ask)(char*) = ask_hugs_dynamic_linker; - ind_True_static_closure - = ask("PrelBase_True_static_closure"); - ind_False_static_closure - = ask("PrelBase_False_static_closure"); - ind_PutFullMVar_static_closure - = ask("PrelException_PutFullMVar_static_closure"); - ind_NonTermination_static_closure - = ask("PrelException_NonTermination_static_closure"); + ind_True_closure + = ask("PrelBase_True_closure"); + ind_False_closure + = ask("PrelBase_False_closure"); + ind_PutFullMVar_closure + = ask("PrelException_PutFullMVar_closure"); + ind_BlockedOnDeadMVar_closure + = ask("PrelException_BlockedOnDeadMVar_closure"); + ind_NonTermination_closure + = ask("PrelException_NonTermination_closure"); ind_unpackCString_closure = ask("PrelPack_unpackCString_closure"); ind_stackOverflow_closure = ask("PrelException_stackOverflow_closure");