X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FException.cmm;h=cba5d48d7236fdef7a1b7def101ffdab429860bb;hb=a11bb49b97eaba892730baf1565e922715dbc07f;hp=c2f0dde6752ed815c4432ebf8514ccbb64044501;hpb=fcf6b22d0478be20e27c2245f3e34dd272e12522;p=ghc-hetmet.git

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index c2f0dde..cba5d48 100644
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -13,9 +13,7 @@
 #include "Cmm.h"
 #include "RaiseAsync.h"
 
-#ifdef __PIC__
 import ghczmprim_GHCziBool_True_closure;
-#endif
 
 /* -----------------------------------------------------------------------------
    Exception Primitives
@@ -75,6 +73,14 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, RET_SMALL )
          */
         Sp_adj(1);
 #endif
+        STK_CHK_GEN( WDS(2), R1_PTR, stg_unblockAsyncExceptionszh_ret_info);
+        Sp_adj(-2);
+        Sp(1) = R1;
+#ifdef REG_R1
+        Sp(0) = stg_gc_unpt_r1_info;
+#else
+        Sp(0) = stg_ut_1_0_unreg_info;
+#endif
         SAVE_THREAD_STATE();
         (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", 
     					              CurrentTSO "ptr") [R1];
@@ -216,7 +222,7 @@ killThreadzh_fast
      */
   loop:
     if (StgTSO_what_next(target) == ThreadRelocated::I16) {
-        target = StgTSO_link(target);
+        target = StgTSO__link(target);
         goto loop;
     }
     if (target == CurrentTSO) {