[project @ 2005-10-26 10:42:54 by simonmar]

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

diff --git a/ghc/rts/StgStartup.cmm b/ghc/rts/StgStartup.cmm
index ece080b..eff3761 100644 (file)
--- 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;
 }