[project @ 2004-11-19 17:24:48 by tharris]

Fix build error during unregistered builds, remove warning building GCCompact

diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h
index 38ad6f0..0eed70c 100644 (file)
--- a/ghc/includes/StgMiscClosures.h
+++ b/ghc/includes/StgMiscClosures.h
@@ -40,6 +40,9 @@ RTS_RET_INFO(stg_upd_frame_info);
 RTS_RET_INFO(stg_noupd_frame_info);
 RTS_RET_INFO(stg_seq_frame_info);
 RTS_RET_INFO(stg_catch_frame_info);
+RTS_RET_INFO(stg_catch_retry_frame_info);
+RTS_RET_INFO(stg_atomically_frame_info);
+RTS_RET_INFO(stg_catch_stm_frame_info);
 
 RTS_ENTRY(stg_upd_frame_ret);
 RTS_ENTRY(stg_seq_frame_ret);
@@ -192,11 +195,19 @@ RTS_ENTRY(stg_raise_entry);
 RTS_ENTRY(stg_END_STM_WAIT_QUEUE_entry);
 RTS_ENTRY(stg_END_STM_CHUNK_LIST_entry);
 RTS_ENTRY(stg_NO_TREC_entry);
+RTS_ENTRY(stg_TVAR_entry);
+RTS_ENTRY(stg_TVAR_WAIT_QUEUE_entry);
+RTS_ENTRY(stg_TREC_CHUNK_entry);
+RTS_ENTRY(stg_TREC_HEADER_entry);
 
 
 RTS_ENTRY(stg_unblockAsyncExceptionszh_ret_ret);
 RTS_ENTRY(stg_blockAsyncExceptionszh_ret_ret);
 RTS_ENTRY(stg_catch_frame_ret);
+RTS_ENTRY(stg_catch_retry_frame_ret);
+RTS_ENTRY(stg_atomically_frame_ret);
+RTS_ENTRY(stg_catch_stm_frame_ret);
+RTS_ENTRY(stg_catch_frame_ret);
 RTS_ENTRY(stg_catch_entry);
 RTS_ENTRY(stg_raise_entry);
 

diff --git a/ghc/rts/GCCompact.c b/ghc/rts/GCCompact.c
index 45836db..2f124d5 100644 (file)
--- a/ghc/rts/GCCompact.c
+++ b/ghc/rts/GCCompact.c
@@ -645,7 +645,7 @@ thread_obj (StgInfoTable *info, StgPtr p)
 
     case TREC_CHUNK:
     {
-        int i;
+        StgWord i;
         StgTRecChunk *tc = (StgTRecChunk *)p;
        TRecEntry *e = &(tc -> entries[0]);
        thread((StgPtr)&tc->prev_chunk);