X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=7d9bc34428d367669cd2432485a1ccc06ea7dc83;hb=fcc3794aeb78081c04103a0b7e7560cb8c7bea58;hp=db495dde78ee6267863ec5dc8b1a9ecf06f1e1d2;hpb=e9fdcd7b7d8ae466d83ce9f77f34e9b62b2a4fa7;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index db495dd..7d9bc34 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)			\
@@ -546,6 +547,7 @@ typedef struct _RtsSymbolVal {
       SymX(barf)				\
       SymX(debugBelch)				\
       SymX(errorBelch)				\
+      SymX(asyncExceptionsBlockedzh_fast)	\
       SymX(blockAsyncExceptionszh_fast)		\
       SymX(catchzh_fast)			\
       SymX(catchRetryzh_fast)			\
@@ -766,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)			\
@@ -1016,7 +1019,9 @@ addDLL( char *dll_name )
 
    initLinker();
 
-   hdl= dlopen(dll_name, RTLD_NOW | RTLD_GLOBAL);
+   // omitted: RTLD_NOW
+   // see http://www.haskell.org/pipermail/cvs-ghc/2007-September/038570.html
+   hdl= dlopen(dll_name, RTLD_LAZY | RTLD_GLOBAL);
 
    if (hdl == NULL) {
       /* dlopen failed; return a ptr to the error msg. */
@@ -3161,7 +3166,7 @@ ocGetNames_ELF ( ObjectCode* oc )
                if (ELF_ST_TYPE(stab[j].st_info) == STT_FUNC)
                    ad = (char *)allocateFunctionDesc((Elf_Addr)ad);
 #endif
-               IF_DEBUG(linker,debugBelch( "addOTabName(GLOB): %10p  %s %s",
+               IF_DEBUG(linker,debugBelch( "addOTabName(GLOB): %10p  %s %s\n",
                                       ad, oc->fileName, nm ));
                isLocal = FALSE;
             }