X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FLinker.c;h=04f272ceb23832058167cbe4dadfc4e46741c5cf;hp=59143b9b0e1d2fa522d538428df55a657cc8f74d;hb=b0ca990457eaf7991e72b13d0040d937b5759b36;hpb=c245355e6f2c7b7c95e9af910c4d420e13af9413

diff --git a/rts/Linker.c b/rts/Linker.c
index 59143b9..04f272c 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -441,6 +441,22 @@ typedef struct _RtsSymbolVal {
    SymX(console_handler)
 #endif
 
+#define RTS_LIBFFI_SYMBOLS                      \
+     Sym(ffi_prep_cif)                          \
+     Sym(ffi_call)                              \
+     Sym(ffi_type_void)                         \
+     Sym(ffi_type_float)                        \
+     Sym(ffi_type_double)                       \
+     Sym(ffi_type_sint64)                       \
+     Sym(ffi_type_uint64)                       \
+     Sym(ffi_type_sint32)                       \
+     Sym(ffi_type_uint32)                       \
+     Sym(ffi_type_sint16)                       \
+     Sym(ffi_type_uint16)                       \
+     Sym(ffi_type_sint8)                        \
+     Sym(ffi_type_uint8)                        \
+     Sym(ffi_type_pointer)
+
 #ifdef TABLES_NEXT_TO_CODE
 #define RTS_RET_SYMBOLS /* nothing */
 #else
@@ -521,6 +537,7 @@ typedef struct _RtsSymbolVal {
       SymX(addDLL)               		\
       GMP_SYMS					\
       SymX(__int_encodeDouble)			\
+      SymX(__2Int_encodeDouble)			\
       SymX(__int_encodeFloat)			\
       SymX(andIntegerzh_fast)			\
       SymX(atomicallyzh_fast)			\
@@ -540,6 +557,8 @@ typedef struct _RtsSymbolVal {
       SymX(createAdjustor)			\
       SymX(decodeDoublezh_fast)			\
       SymX(decodeFloatzh_fast)			\
+      SymX(decodeDoublezu2Intzh_fast)			\
+      SymX(decodeFloatzuIntzh_fast)			\
       SymX(defaultsHook)			\
       SymX(delayzh_fast)			\
       SymX(deRefWeakzh_fast)			\
@@ -757,15 +776,15 @@ typedef struct _RtsSymbolVal {
       SymX(writeTVarzh_fast)			\
       SymX(xorIntegerzh_fast)			\
       SymX(yieldzh_fast)                        \
-      SymX(stg_interp_constr_entry)             \
+      Sym(stg_interp_constr_entry)              \
       SymX(allocateExec)	                \
       SymX(freeExec)		                \
       SymX(getAllocations)                      \
       SymX(revertCAFs)                          \
       SymX(RtsFlags)                            \
-      SymX(rts_breakpoint_io_action)		\
-      SymX(rts_stop_next_breakpoint)		\
-      SymX(rts_stop_on_exception)		\
+      Sym(rts_breakpoint_io_action)		\
+      Sym(rts_stop_next_breakpoint)		\
+      Sym(rts_stop_on_exception)		\
       SymX(stopTimer)				\
       SymX(n_capabilities)			\
       RTS_USER_SIGNALS_SYMBOLS
@@ -828,6 +847,7 @@ RTS_MINGW_ONLY_SYMBOLS
 RTS_CYGWIN_ONLY_SYMBOLS
 RTS_DARWIN_ONLY_SYMBOLS
 RTS_LIBGCC_SYMBOLS
+RTS_LIBFFI_SYMBOLS
 #undef Sym
 #undef SymX
 #undef SymX_redirect
@@ -860,6 +880,7 @@ static RtsSymbolVal rtsSyms[] = {
       RTS_CYGWIN_ONLY_SYMBOLS
       RTS_DARWIN_ONLY_SYMBOLS
       RTS_LIBGCC_SYMBOLS
+      RTS_LIBFFI_SYMBOLS
 #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
       // dyld stub code contains references to this,
       // but it should never be called because we treat