X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgMiscClosures.h;h=b81ec90d987f76f743505742dbe89cb9e4aae67c;hb=3595da95b2ca0d60c9100f77541b6ce36e49363c;hp=18e9b6332a0d675b88913bc8ec9354b2174db4f1;hpb=6d194f48d7313fa8daa004b7b3e3a55ffa52f4a9;p=ghc-hetmet.git

diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h
index 18e9b63..b81ec90 100644
--- a/ghc/includes/StgMiscClosures.h
+++ b/ghc/includes/StgMiscClosures.h
@@ -37,7 +37,6 @@
 
 /* Stack frames */
 RTS_RET_INFO(stg_upd_frame_info);
-RTS_RET_INFO(stg_bh_upd_frame_info);
 RTS_RET_INFO(stg_noupd_frame_info);
 RTS_RET_INFO(stg_seq_frame_info);
 RTS_RET_INFO(stg_catch_frame_info);
@@ -46,7 +45,6 @@ RTS_RET_INFO(stg_atomically_frame_info);
 RTS_RET_INFO(stg_catch_stm_frame_info);
 
 RTS_ENTRY(stg_upd_frame_ret);
-RTS_ENTRY(stg_bh_upd_frame_ret);
 RTS_ENTRY(stg_seq_frame_ret);
 
 /* Entry code for constructors created by the bytecode interpreter */
@@ -97,9 +95,9 @@ RTS_INFO(stg_IND_OLDGEN_info);
 RTS_INFO(stg_IND_OLDGEN_PERM_info);
 RTS_INFO(stg_CAF_UNENTERED_info);
 RTS_INFO(stg_CAF_ENTERED_info);
+RTS_INFO(stg_WHITEHOLE_info);
 RTS_INFO(stg_BLACKHOLE_info);
 RTS_INFO(stg_CAF_BLACKHOLE_info);
-RTS_INFO(stg_BLACKHOLE_BQ_info);
 #ifdef TICKY_TICKY
 RTS_INFO(stg_SE_BLACKHOLE_info);
 RTS_INFO(stg_SE_CAF_BLACKHOLE_info);
@@ -158,9 +156,9 @@ RTS_ENTRY(stg_IND_OLDGEN_entry);
 RTS_ENTRY(stg_IND_OLDGEN_PERM_entry);
 RTS_ENTRY(stg_CAF_UNENTERED_entry);
 RTS_ENTRY(stg_CAF_ENTERED_entry);
+RTS_ENTRY(stg_WHITEHOLE_entry);
 RTS_ENTRY(stg_BLACKHOLE_entry);
 RTS_ENTRY(stg_CAF_BLACKHOLE_entry);
-RTS_ENTRY(stg_BLACKHOLE_BQ_entry);
 #ifdef TICKY_TICKY
 RTS_ENTRY(stg_SE_BLACKHOLE_entry);
 RTS_ENTRY(stg_SE_CAF_BLACKHOLE_entry);
@@ -464,7 +462,9 @@ RTS_FUN(stg_block_putmvar);
 RTS_ENTRY(stg_block_putmvar_ret);
 #ifdef mingw32_HOST_OS
 RTS_FUN(stg_block_async);
+RTS_ENTRY(stg_block_async_ret);
 RTS_FUN(stg_block_async_void);
+RTS_ENTRY(stg_block_async_void_ret);
 #endif
 
 /* Entry/exit points from StgStartup.cmm */
@@ -473,7 +473,8 @@ RTS_RET_INFO(stg_stop_thread_info);
 RTS_ENTRY(stg_stop_thread_ret);
 
 RTS_FUN(stg_returnToStackTop);
-RTS_FUN(stg_enterStackTop);
+RTS_FUN(stg_returnToSched);
+RTS_FUN(stg_returnToSchedButFirst);
 
 RTS_FUN(stg_init_finish);
 RTS_FUN(stg_init);