X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=114b3fc01fdc09c6a4aa7db8c43ad9e27465f995;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=aa10c44eb8835060b306e493ccddf0b252493fd1;hpb=d28ba8c800901bea01f70c4719278c2a364cf9fc;p=ghc-hetmet.git

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index aa10c44..114b3fc 100644
--- 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.41 2004/08/13 13:10:10 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -23,10 +23,6 @@
 # include "Printer.h"   /* for printing        */
 #endif
 
-#ifdef INTERPRETER
-# include "Assembler.h"
-#endif
-
 #ifdef PAR
 # include "Parallel.h"
 # include "ParallelRts.h"
@@ -41,7 +37,7 @@
 # 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
@@ -53,7 +49,7 @@ int main(int argc, char *argv[])
     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;
@@ -105,7 +101,9 @@ int main(int argc, char *argv[])
 #  else /* !PAR && !GRAN */
 
     /* ToDo: want to start with a larger stack size */
-    status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL);
+    rts_lock();
+    status = rts_evalLazyIO((HaskellObj)mainIO_closure, NULL);
+    rts_unlock();
 
 #  endif /* !PAR && !GRAN */