Deal with non-executable memory on Darwin (only an issue on Darwin/x86 so far)

[ghc-hetmet.git] / ghc / rts / Main.c

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index cceb607..6aef280 100644 (file)
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.42 2004/09/03 15:28:34 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -17,6 +16,7 @@
 #include "RtsFlags.h"
 #include "RtsUtils.h"
 #include "Prelude.h"
+#include "Task.h"
 #include <stdlib.h>
 
 #ifdef DEBUG
@@ -101,9 +101,12 @@ int main(int argc, char *argv[])
 #  else /* !PAR && !GRAN */
 
     /* ToDo: want to start with a larger stack size */
-    rts_lock();
-    status = rts_evalLazyIO((HaskellObj)mainIO_closure, NULL);
-    rts_unlock();
+    { 
+       void *cap = rts_lock();
+       cap = rts_evalLazyIO(cap,(HaskellObj)(void *)mainIO_closure, NULL);
+       status = rts_getSchedStatus(cap);
+       rts_unlock(cap);
+    }
 
 #  endif /* !PAR && !GRAN */