[project @ 2003-07-10 08:02:29 by simonpj]

Part of the fix to External-Core (:Main, not $Main), which got left out

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index aa10c44..a651eaa 100644 (file)
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
 /* -----------------------------------------------------------------------------

- * $Id: Main.c,v 1.38 2003/06/23 10:35:23 simonpj Exp $
+ * $Id: Main.c,v 1.39 2003/07/10 08:02:29 simonpj Exp $

  *
  * (c) The GHC Team 1998-2000
  *
  *
  * (c) The GHC Team 1998-2000
  *

@@ -41,7 +41,7 @@
 # include <windows.h>
 #endif
 
 # include <windows.h>
 #endif
 

-extern void __stginit_zdMain(void);
+extern void __stginit_ZCMain(void);

 
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set
 
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set

@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 

-    startupHaskell(argc,argv,__stginit_zdMain);
+    startupHaskell(argc,argv,__stginit_ZCMain);

 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;
 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;

diff --git a/ghc/rts/Prelude.h b/ghc/rts/Prelude.h
index 486aa61..a998dd2 100644 (file)
--- a/ghc/rts/Prelude.h
+++ b/ghc/rts/Prelude.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
 /* -----------------------------------------------------------------------------

- * $Id: Prelude.h,v 1.23 2003/06/23 10:35:23 simonpj Exp $
+ * $Id: Prelude.h,v 1.24 2003/07/10 08:02:29 simonpj Exp $

  *
  * (c) The GHC Team, 1998-2001
  *
  *
  * (c) The GHC Team, 1998-2001
  *

@@ -18,7 +18,7 @@ extern DLL_IMPORT StgClosure GHCziBase_True_closure;
 extern DLL_IMPORT StgClosure GHCziBase_False_closure;
 extern DLL_IMPORT StgClosure GHCziPack_unpackCString_closure;
 extern DLL_IMPORT StgClosure GHCziWeak_runFinalizzerBatch_closure;
 extern DLL_IMPORT StgClosure GHCziBase_False_closure;
 extern DLL_IMPORT StgClosure GHCziPack_unpackCString_closure;
 extern DLL_IMPORT StgClosure GHCziWeak_runFinalizzerBatch_closure;

-extern StgClosure zdMain_main_closure;
+extern StgClosure ZCMain_main_closure;

 extern DLL_IMPORT StgClosure GHCziTopHandler_runIO_closure;
 extern DLL_IMPORT StgClosure GHCziTopHandler_runNonIO_closure;
 
 extern DLL_IMPORT StgClosure GHCziTopHandler_runIO_closure;
 extern DLL_IMPORT StgClosure GHCziTopHandler_runNonIO_closure;
 

@@ -67,7 +67,7 @@ extern DLL_IMPORT const StgInfoTable GHCziStable_StablePtr_con_info;
 #define False_closure             (&GHCziBase_False_closure)
 #define unpackCString_closure     (&GHCziPack_unpackCString_closure)
 #define runFinalizerBatch_closure (&GHCziWeak_runFinalizzerBatch_closure)
 #define False_closure             (&GHCziBase_False_closure)
 #define unpackCString_closure     (&GHCziPack_unpackCString_closure)
 #define runFinalizerBatch_closure (&GHCziWeak_runFinalizzerBatch_closure)

-#define mainIO_closure            (&zdMain_main_closure)
+#define mainIO_closure            (&ZCMain_main_closure)

 #define runIO_closure            (&GHCziTopHandler_runIO_closure)
 #define runNonIO_closure         (&GHCziTopHandler_runNonIO_closure)
 
 #define runIO_closure            (&GHCziTopHandler_runIO_closure)
 #define runNonIO_closure         (&GHCziTopHandler_runNonIO_closure)