Improve error reporting for 'deriving' (Trac #2604)

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

diff --git a/rts/StgStartup.cmm b/rts/StgStartup.cmm
index 5b0f7e2..16e5c62 100644 (file)
--- a/rts/StgStartup.cmm
+++ b/rts/StgStartup.cmm
@@ -142,22 +142,15 @@ stg_threadFinished
 
     forceIO takes care of this, performing the IO action and entering the
     results that comes back.
 
     forceIO takes care of this, performing the IO action and entering the
     results that comes back.

+

     ------------------------------------------------------------------------- */
 
 INFO_TABLE_RET( stg_forceIO, RET_SMALL)
 
     ------------------------------------------------------------------------- */
 
 INFO_TABLE_RET( stg_forceIO, RET_SMALL)
 

-#ifdef REG_R1

 {
   Sp_adj(1);
   ENTER();
 }
 {
   Sp_adj(1);
   ENTER();
 }

-#else
-{
-  R1 = Sp(0);
-  Sp_adj(2);
-  ENTER();
-}
-#endif

 
 /* -----------------------------------------------------------------------------
     Non-strict IO application.
 
 /* -----------------------------------------------------------------------------
     Non-strict IO application.

@@ -170,18 +163,10 @@ INFO_TABLE_RET( stg_forceIO, RET_SMALL)
 
 INFO_TABLE_RET( stg_noforceIO, RET_SMALL )
 
 
 INFO_TABLE_RET( stg_noforceIO, RET_SMALL )
 

-#ifdef REG_R1

 {
   Sp_adj(1);
   jump %ENTRY_CODE(Sp(0));
 }
 {
   Sp_adj(1);
   jump %ENTRY_CODE(Sp(0));
 }

-#else
-{
-  R1 = Sp(0);
-  Sp_adj(2);
-  jump %ENTRY_CODE(Sp(0));
-}
-#endif

 
 /* -----------------------------------------------------------------------------
    Special STG entry points for module registration.
 
 /* -----------------------------------------------------------------------------
    Special STG entry points for module registration.