X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=90ceacaea5e3275705936f6f16dd250ce33a3633;hb=f6013eedb4dea47afac8167dfa08561ae90454db;hp=e3278b5ef480be4796dafbfec5f4224fc9000682;hpb=a35d65c3465de9661325a9295715b1ef298eb888;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index e3278b5..90ceaca 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -21,6 +21,7 @@
 #include "HsFFI.h"
 
 #include "sm/Storage.h"
+#include "Stats.h"
 #include "Hash.h"
 #include "LinkerInternals.h"
 #include "RtsUtils.h"
@@ -505,10 +506,13 @@ typedef struct _RtsSymbolVal {
 #if !defined(mingw32_HOST_OS)
 #define RTS_USER_SIGNALS_SYMBOLS \
    SymI_HasProto(setIOManagerPipe) \
+   SymI_HasProto(ioManagerWakeup) \
+   SymI_HasProto(ioManagerSync) \
    SymI_HasProto(blockUserSignals) \
    SymI_HasProto(unblockUserSignals)
 #else
 #define RTS_USER_SIGNALS_SYMBOLS     \
+   SymI_HasProto(ioManagerWakeup) \
    SymI_HasProto(sendIOManagerEvent) \
    SymI_HasProto(readIOManagerEvent) \
    SymI_HasProto(getIOManagerEvent)  \
@@ -666,6 +670,21 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(RET_SEMI_loads_avoided)
 
 
+// On most platforms, the garbage collector rewrites references
+//	to small integer and char objects to a set of common, shared ones.
+//
+// We don't do this when compiling to Windows DLLs at the moment because
+//	it doesn't support cross package data references well.
+//
+#if defined(__PIC__) && defined(mingw32_HOST_OS)
+#define RTS_INTCHAR_SYMBOLS
+#else
+#define RTS_INTCHAR_SYMBOLS				\
+      SymI_HasProto(stg_CHARLIKE_closure)		\
+      SymI_HasProto(stg_INTLIKE_closure)		
+#endif
+
+
 #define RTS_SYMBOLS				        \
       Maybe_Stable_Names			        \
       RTS_TICKY_SYMBOLS                                 \
@@ -736,7 +755,11 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(forkOS_createThread)		\
       SymI_HasProto(freeHaskellFunctionPtr)		\
       SymI_HasProto(getOrSetTypeableStore)		\
-      SymI_HasProto(getOrSetSignalHandlerStore)		\
+      SymI_HasProto(getOrSetGHCConcSignalHandlerStore)		\
+      SymI_HasProto(getOrSetGHCConcPendingEventsStore)		\
+      SymI_HasProto(getOrSetGHCConcPendingDelaysStore)		\
+      SymI_HasProto(getOrSetGHCConcIOManagerThreadStore)	\
+      SymI_HasProto(getOrSetGHCConcProddingStore)		\
       SymI_HasProto(genSymZh)				\
       SymI_HasProto(genericRaise)			\
       SymI_HasProto(getProgArgv)			\
@@ -846,11 +869,9 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(stg_CAF_BLACKHOLE_info)		\
       SymI_HasProto(__stg_EAGER_BLACKHOLE_info)		\
       SymI_HasProto(startTimer)                         \
-      SymI_HasProto(stg_CHARLIKE_closure)		\
       SymI_HasProto(stg_MVAR_CLEAN_info)		\
       SymI_HasProto(stg_MVAR_DIRTY_info)		\
       SymI_HasProto(stg_IND_STATIC_info)		\
-      SymI_HasProto(stg_INTLIKE_closure)		\
       SymI_HasProto(stg_ARR_WORDS_info)                 \
       SymI_HasProto(stg_MUT_ARR_PTRS_DIRTY_info)	\
       SymI_HasProto(stg_MUT_ARR_PTRS_FROZEN_info)	\
@@ -923,9 +944,8 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(stg_writeTVarzh)			\
       SymI_HasProto(stg_yieldzh)                        \
       SymI_NeedsProto(stg_interp_constr_entry)          \
-      SymI_HasProto(alloc_blocks)                       \
       SymI_HasProto(alloc_blocks_lim)                   \
-      SymI_HasProto(allocateLocal)                      \
+      SymI_HasProto(allocate)                           \
       SymI_HasProto(allocateExec)	                \
       SymI_HasProto(freeExec)		                \
       SymI_HasProto(getAllocations)                     \
@@ -938,7 +958,8 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(n_capabilities)			\
       SymI_HasProto(stg_traceCcszh)                     \
       SymI_HasProto(stg_traceEventzh)                   \
-      RTS_USER_SIGNALS_SYMBOLS
+      RTS_USER_SIGNALS_SYMBOLS				\
+      RTS_INTCHAR_SYMBOLS
 
 
 // 64-bit support functions in libgcc.a