X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fruntime%2Fmain%2FThreads.lc;fp=ghc%2Fruntime%2Fmain%2FThreads.lc;h=ce4178aa9519d5c285acd99b059a176ee7476895;hb=65c206597417f0200ba0d56484632e15c4532789;hp=51a48fbfa0ac59d73a7588070d1c35d9bd951e16;hpb=3331382e7c198b9080389a60742e5eb508032466;p=ghc-hetmet.git

diff --git a/ghc/runtime/main/Threads.lc b/ghc/runtime/main/Threads.lc
index 51a48fb..ce4178a 100644
--- a/ghc/runtime/main/Threads.lc
+++ b/ghc/runtime/main/Threads.lc
@@ -175,10 +175,13 @@ I_ threadId = 0;
        but slower than GUM sparks. There is no fixed upper bound on the
        number of GRAN sparks either. -- HWL
 */
-#if !defined(GRAN)
+#if defined(PAR)
+
+I_ sparksIgnored =0, sparksCreated = 0; 
 
-I_ sparksIgnored =0;
+#endif
 
+#if defined(CONCURRENT) && !defined(GRAN)
 I_ SparkLimit[SPARK_POOLS];
 
 rtsBool
@@ -198,7 +201,7 @@ initThreadPools(STG_NO_ARGS)
     return rtsTrue;
 
 }
-#endif  /* !GRAN */
+#endif
 
 #ifdef PAR
 rtsBool sameThread;
@@ -2564,8 +2567,8 @@ W_ type;
 #endif
 
     if (type == T_MAIN) {
-        STKO_SpA(stko) -= AREL(1);
-        *STKO_SpA(stko) = (P_) realWorldZh_closure;
+        STKO_SpB(stko) -= BREL(1);
+        *STKO_SpB(stko) = (P_) realWorldZh_closure;
     }
 
     SAVE_Ret = (StgRetAddr) UNVEC(stopThreadDirectReturn,vtbl_stopStgWorld);