From: simonmar <unknown>
Date: Thu, 17 Mar 2005 13:14:59 +0000 (+0000)
Subject: [project @ 2005-03-17 13:14:59 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~890
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=02b0949907fe7cc0853663663b2190fe019f7acd;p=ghc-hetmet.git

[project @ 2005-03-17 13:14:59 by simonmar]
Fix +RTS -xc, which is broken in 6.4.
---

diff --git a/ghc/rts/Exception.cmm b/ghc/rts/Exception.cmm
index 0348d30..edabf54 100644
--- a/ghc/rts/Exception.cmm
+++ b/ghc/rts/Exception.cmm
@@ -285,7 +285,7 @@ catchzh_fast
   
     /* Set up the catch frame */
     Sp = Sp - SIZEOF_StgCatchFrame;
-    SET_HDR(Sp,stg_catch_frame_info,CCCS);
+    SET_HDR(Sp,stg_catch_frame_info,W_[CCCS]);
     
     StgCatchFrame_handler(Sp) = R2;
     StgCatchFrame_exceptions_blocked(Sp) = 
@@ -330,7 +330,7 @@ raisezh_fast
      * the info was only displayed for an *uncaught* exception.
      */
     if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags)) {
-      foreign "C" fprintCCS(stderr,CCCS);
+      foreign "C" fprintCCS(stderr,W_[CCCS]);
     }
 #endif