Cleanup after the OPTIONS parsing was moved.

[ghc-hetmet.git] / ghc / rts / StgStartup.cmm

diff --git a/ghc/rts/StgStartup.cmm b/ghc/rts/StgStartup.cmm
index eff3761..2f2a759 100644 (file)
--- a/ghc/rts/StgStartup.cmm
+++ b/ghc/rts/StgStartup.cmm
@@ -29,7 +29,7 @@
     ASSERT(Sp != 0);                   \
     ASSERT(SpLim != 0);                        \
     ASSERT(HpLim != 0);                        \
-    ASSERT(SpLim - RESERVED_STACK_WORDS <= Sp); \
+    ASSERT(SpLim - WDS(RESERVED_STACK_WORDS) <= Sp); \
     ASSERT(HpLim >= Hp);
 
 /* -----------------------------------------------------------------------------
@@ -118,7 +118,7 @@ stg_returnToStackTop
 stg_returnToSched
 {
   SAVE_THREAD_STATE();
-  foreign "C" threadPaused(CurrentTSO);
+  foreign "C" threadPaused(MyCapability() "ptr", CurrentTSO);
   jump StgReturn;
 }
 
@@ -139,7 +139,7 @@ stg_returnToSchedNotPaused
 stg_returnToSchedButFirst
 {
   SAVE_THREAD_STATE();
-  foreign "C" threadPaused(CurrentTSO);
+  foreign "C" threadPaused(MyCapability() "ptr", CurrentTSO);
   jump R2;
 }