X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=6029921436b0d6a9fc1deb524c9af5076b4ac8bb;hb=9a9feb62db17daf7f2566395f719c2aecec5feb0;hp=aa10c44eb8835060b306e493ccddf0b252493fd1;hpb=d28ba8c800901bea01f70c4719278c2a364cf9fc;p=ghc-hetmet.git diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c index aa10c44..6029921 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.40 2003/09/21 22:20:55 wolfgang Exp $ * * (c) The GHC Team 1998-2000 * @@ -41,7 +41,7 @@ # include #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 +53,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 +105,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 */