X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStgStartup.cmm;fp=ghc%2Frts%2FStgStartup.cmm;h=eff376162ce93f47f1a63b70eef7dc447caa0e36;hb=7c82b4a858411e7363f46d29bbd297e7880ef625;hp=ece080b8b755b8eec72d470b5f1f678c6e9a6667;hpb=474656aa64e690fc48752eabecf2b76532c31ea7;p=ghc-hetmet.git

diff --git a/ghc/rts/StgStartup.cmm b/ghc/rts/StgStartup.cmm
index ece080b..eff3761 100644
--- a/ghc/rts/StgStartup.cmm
+++ b/ghc/rts/StgStartup.cmm
@@ -92,8 +92,9 @@ INFO_TABLE_RET( stg_stop_thread, STOP_THREAD_WORDS, STOP_THREAD_BITMAP,
 
     SAVE_THREAD_STATE();
 
-    /* R1 contains the return value of the thread */
-    R1 = ThreadFinished;
+    /* The return code goes in BaseReg->rRet, and BaseReg is returned in R1 */
+    StgRegTable_rRet(BaseReg) = ThreadFinished;
+    R1 = BaseReg;
 
     jump StgReturn;
 }