X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=04f272ceb23832058167cbe4dadfc4e46741c5cf;hb=2fa5a66abb8c92a9eb2707317d3c8723e4768e7b;hp=81709f7819a8f6fc2196ea02675c1bf59bb84a8f;hpb=2fc88e736892981b8b2b46661ac11f14dc351bc8;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 81709f7..04f272c 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -174,6 +174,8 @@ typedef struct _RtsSymbolVal {
 
 #if !defined (mingw32_HOST_OS)
 #define RTS_POSIX_ONLY_SYMBOLS                  \
+      Sym(lockFile)                             \
+      Sym(unlockFile)                           \
       SymX(signal_handlers)			\
       SymX(stg_sig_install)			\
       Sym(nocldstop)
@@ -439,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
@@ -461,9 +479,26 @@ typedef struct _RtsSymbolVal {
       SymX(stg_ap_pppppp_ret)
 #endif
 
+/* On Windows, we link libgmp.a statically into libHSrts.dll */
+#ifdef mingw32_HOST_OS
+#define GMP_SYMS				\
+      SymX(__gmpz_cmp)				\
+      SymX(__gmpz_cmp_si)			\
+      SymX(__gmpz_cmp_ui)			\
+      SymX(__gmpz_get_si)			\
+      SymX(__gmpz_get_ui)
+#else
+#define GMP_SYMS				\
+      SymExtern(__gmpz_cmp)			\
+      SymExtern(__gmpz_cmp_si)			\
+      SymExtern(__gmpz_cmp_ui)			\
+      SymExtern(__gmpz_get_si)			\
+      SymExtern(__gmpz_get_ui)
+#endif
+
 #define RTS_SYMBOLS				\
       Maybe_Stable_Names			\
-      Sym(StgReturn)				\
+      SymX(StgReturn)				\
       SymX(stg_enter_info)			\
       SymX(stg_gc_void_info)			\
       SymX(__stg_gc_enter_1)			\
@@ -500,13 +535,9 @@ typedef struct _RtsSymbolVal {
       SymX(__encodeDouble)			\
       SymX(__encodeFloat)			\
       SymX(addDLL)               		\
-      SymExtern(__gmpn_gcd_1)			\
-      SymExtern(__gmpz_cmp)			\
-      SymExtern(__gmpz_cmp_si)			\
-      SymExtern(__gmpz_cmp_ui)			\
-      SymExtern(__gmpz_get_si)			\
-      SymExtern(__gmpz_get_ui)			\
+      GMP_SYMS					\
       SymX(__int_encodeDouble)			\
+      SymX(__2Int_encodeDouble)			\
       SymX(__int_encodeFloat)			\
       SymX(andIntegerzh_fast)			\
       SymX(atomicallyzh_fast)			\
@@ -526,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)			\
@@ -743,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
@@ -814,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
@@ -846,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