X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=318b3f070db9ee536bc8f10e293c420abcc0e5b6;hb=d9f20043f1bff6d3731e62de4db4d98fcff57498;hp=e2391842a29150091412778cff3d806e00d58240;hpb=086bab42386098009471c46139013c41f40856a2;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index e239184..318b3f0 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -174,6 +174,7 @@ typedef struct _RtsSymbolVal {
 
 #if !defined (mingw32_HOST_OS)
 #define RTS_POSIX_ONLY_SYMBOLS                  \
+      SymX(shutdownHaskellAndSignal)		\
       Sym(lockFile)                             \
       Sym(unlockFile)                           \
       SymX(signal_handlers)			\
@@ -441,6 +442,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
@@ -482,7 +499,7 @@ typedef struct _RtsSymbolVal {
 
 #define RTS_SYMBOLS				\
       Maybe_Stable_Names			\
-      Sym(StgReturn)				\
+      SymX(StgReturn)				\
       SymX(stg_enter_info)			\
       SymX(stg_gc_void_info)			\
       SymX(__stg_gc_enter_1)			\
@@ -521,12 +538,16 @@ typedef struct _RtsSymbolVal {
       SymX(addDLL)               		\
       GMP_SYMS					\
       SymX(__int_encodeDouble)			\
+      SymX(__word_encodeDouble)			\
+      SymX(__2Int_encodeDouble)			\
       SymX(__int_encodeFloat)			\
+      SymX(__word_encodeFloat)			\
       SymX(andIntegerzh_fast)			\
       SymX(atomicallyzh_fast)			\
       SymX(barf)				\
       SymX(debugBelch)				\
       SymX(errorBelch)				\
+      SymX(asyncExceptionsBlockedzh_fast)	\
       SymX(blockAsyncExceptionszh_fast)		\
       SymX(catchzh_fast)			\
       SymX(catchRetryzh_fast)			\
@@ -540,6 +561,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)			\
@@ -745,6 +768,7 @@ typedef struct _RtsSymbolVal {
       SymX(stg_upd_frame_info)			\
       SymX(suspendThread)			\
       SymX(takeMVarzh_fast)			\
+      SymX(threadStatuszh_fast)			\
       SymX(timesIntegerzh_fast)			\
       SymX(tryPutMVarzh_fast)			\
       SymX(tryTakeMVarzh_fast)			\
@@ -757,15 +781,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 +852,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 +885,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
@@ -2285,6 +2311,8 @@ ocGetNames_PEi386 ( ObjectCode* oc )
           && 0 != strcmp(".ctors", sectab_i->Name)
           /* ignore section generated from .ident */
           && 0!= strcmp("/4", sectab_i->Name)
+	  /* ignore unknown section that appeared in gcc 3.4.5(?) */
+          && 0!= strcmp(".reloc", sectab_i->Name)
          ) {
          errorBelch("Unknown PEi386 section name `%s' (while processing: %s)", sectab_i->Name, oc->fileName);
          return 0;