X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=74085722250c29b378ea4ae5b8489019e17dd604;hb=dc6008a61acedd3d0785111cf8955c479cb226a4;hp=b193f014c37c17e7f998cb42a1da85cc09b84b55;hpb=e0fcf61dca4dfac99cb5417e1bc4cbee18822cf2;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index b193f01..7408572 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -59,12 +59,12 @@
 #include <sys/wait.h>
 #endif
 
-#if defined(ia64_HOST_ARCH) || defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
+#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
 #define USE_MMAP
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -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)			\
@@ -537,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)			\
@@ -556,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)			\
@@ -761,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)			\
@@ -773,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
@@ -2303,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;