RTS tidyup sweep, first phase

[ghc-hetmet.git] / includes / stg / MiscClosures.h

diff --git a/includes/StgMiscClosures.h b/includes/stg/MiscClosures.h
similarity index 99%
rename from includes/StgMiscClosures.h
rename to includes/stg/MiscClosures.h
index d5a03fc..1591570 100644 (file)
--- a/includes/StgMiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -253,7 +253,6 @@ RTS_INFO(stg_sel_5_upd_info);
 RTS_INFO(stg_sel_6_upd_info);
 RTS_INFO(stg_sel_7_upd_info);
 RTS_INFO(stg_sel_8_upd_info);
 RTS_INFO(stg_sel_6_upd_info);
 RTS_INFO(stg_sel_7_upd_info);
 RTS_INFO(stg_sel_8_upd_info);

-RTS_INFO(stg_sel_8_upd_info);

 RTS_INFO(stg_sel_9_upd_info);
 RTS_INFO(stg_sel_10_upd_info);
 RTS_INFO(stg_sel_11_upd_info);
 RTS_INFO(stg_sel_9_upd_info);
 RTS_INFO(stg_sel_10_upd_info);
 RTS_INFO(stg_sel_11_upd_info);

@@ -271,7 +270,6 @@ RTS_ENTRY(stg_sel_5_upd_entry);
 RTS_ENTRY(stg_sel_6_upd_entry);
 RTS_ENTRY(stg_sel_7_upd_entry);
 RTS_ENTRY(stg_sel_8_upd_entry);
 RTS_ENTRY(stg_sel_6_upd_entry);
 RTS_ENTRY(stg_sel_7_upd_entry);
 RTS_ENTRY(stg_sel_8_upd_entry);

-RTS_ENTRY(stg_sel_8_upd_entry);

 RTS_ENTRY(stg_sel_9_upd_entry);
 RTS_ENTRY(stg_sel_10_upd_entry);
 RTS_ENTRY(stg_sel_11_upd_entry);
 RTS_ENTRY(stg_sel_9_upd_entry);
 RTS_ENTRY(stg_sel_10_upd_entry);
 RTS_ENTRY(stg_sel_11_upd_entry);

@@ -517,7 +515,7 @@ RTS_FUN(orIntegerzh_fast);
 RTS_FUN(xorIntegerzh_fast);
 RTS_FUN(complementIntegerzh_fast);
 
 RTS_FUN(xorIntegerzh_fast);
 RTS_FUN(complementIntegerzh_fast);
 

-#ifdef SUPPORT_LONG_LONGS
+#if SIZEOF_HSINT == 4

 
 RTS_FUN(int64ToIntegerzh_fast);
 RTS_FUN(word64ToIntegerzh_fast);
 
 RTS_FUN(int64ToIntegerzh_fast);
 RTS_FUN(word64ToIntegerzh_fast);