From: panne <unknown>
Date: Sun, 27 Jan 2002 10:53:26 +0000 (+0000)
Subject: [project @ 2002-01-27 10:53:26 by panne]
X-Git-Tag: Approximately_9120_patches~250
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=388a634754d1d512ddcc207d3b12fd04522d2868;p=ghc-hetmet.git

[project @ 2002-01-27 10:53:26 by panne]
Unbreak 2nd stage build by tracking recent RTS naming changes
(ATTENTION: I'm not quite sure what I'm doing here exactly,
 but things seem to work... :-}
---

diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs
index b993aed..5e93817 100644
--- a/ghc/compiler/ghci/ByteCodeLink.lhs
+++ b/ghc/compiler/ghci/ByteCodeLink.lhs
@@ -370,12 +370,12 @@ mkBits findLabel st proto_insns
             where
                ret_itbl_addr 
                   = case pk of
-                       CharRep   -> stg_gc_unbx_r1_ret_info
-                       IntRep    -> stg_gc_unbx_r1_ret_info
-                       WordRep   -> stg_gc_unbx_r1_ret_info
-                       AddrRep   -> stg_gc_unbx_r1_ret_info
-                       FloatRep  -> stg_gc_f1_ret_info
-                       DoubleRep -> stg_gc_d1_ret_info
+                       CharRep   -> stg_gc_unbx_r1_info
+                       IntRep    -> stg_gc_unbx_r1_info
+                       WordRep   -> stg_gc_unbx_r1_info
+                       AddrRep   -> stg_gc_unbx_r1_info
+                       FloatRep  -> stg_gc_f1_info
+                       DoubleRep -> stg_gc_d1_info
                        VoidRep   -> nullAddr  
                        -- Interpreter.c spots this special case
                        other     -> pprPanic "ByteCodeLink.itoc_itbl" (ppr pk)
@@ -386,9 +386,9 @@ foreign label "stg_ctoi_ret_F1_info"  stg_ctoi_ret_F1_info :: Addr
 foreign label "stg_ctoi_ret_D1_info"  stg_ctoi_ret_D1_info :: Addr
 foreign label "stg_ctoi_ret_V_info"   stg_ctoi_ret_V_info :: Addr
 
-foreign label "stg_gc_unbx_r1_ret_info" stg_gc_unbx_r1_ret_info :: Addr
-foreign label "stg_gc_f1_ret_info"      stg_gc_f1_ret_info :: Addr
-foreign label "stg_gc_d1_ret_info"      stg_gc_d1_ret_info :: Addr
+foreign label "stg_gc_unbx_r1_info" stg_gc_unbx_r1_info :: Addr
+foreign label "stg_gc_f1_info"      stg_gc_f1_info :: Addr
+foreign label "stg_gc_d1_info"      stg_gc_d1_info :: Addr
 
 -- The size in 16-bit entities of an instruction.
 instrSize16s :: BCInstr -> Int