X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=d41ede6e1055cb4b7fa1b8e5b270da998ef47ddd;hb=f949be5748e7a99ec323b8d59144e322e9e86eb1;hp=ef12e3e9aac8a2d2b1e3db19524af97bc2c2cfc8;hpb=6c095bfa3c8c81b52ad92853acd326453d320d7b;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index ef12e3e..d41ede6 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -26,7 +26,7 @@
 #include "RtsUtils.h"
 #include "Schedule.h"
 #include "Sparks.h"
-#include "RtsTypeable.h"
+#include "RtsGlobals.h"
 #include "Timer.h"
 #include "Trace.h"
 
@@ -205,7 +205,7 @@ static void machoInitSymbolsWithoutUnderscore( void );
 #define MMAP_32BIT_BASE_DEFAULT 0x40000000
 #endif
 
-static void *mmap_32bit_base = MMAP_32BIT_BASE_DEFAULT;
+static void *mmap_32bit_base = (void *)MMAP_32BIT_BASE_DEFAULT;
 #endif
 
 /* MAP_ANONYMOUS is MAP_ANON on some systems, e.g. OpenBSD */
@@ -493,7 +493,9 @@ typedef struct _RtsSymbolVal {
 
 #if !defined(mingw32_HOST_OS)
 #define RTS_USER_SIGNALS_SYMBOLS \
-   SymI_HasProto(setIOManagerPipe)
+   SymI_HasProto(setIOManagerPipe) \
+   SymI_NeedsProto(blockUserSignals) \
+   SymI_NeedsProto(unblockUserSignals)
 #else
 #define RTS_USER_SIGNALS_SYMBOLS     \
    SymI_HasProto(sendIOManagerEvent) \
@@ -607,6 +609,7 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(barf)				\
       SymI_HasProto(debugBelch)				\
       SymI_HasProto(errorBelch)				\
+      SymI_HasProto(sysErrorBelch)                      \
       SymI_HasProto(asyncExceptionsBlockedzh_fast)	\
       SymI_HasProto(blockAsyncExceptionszh_fast)	\
       SymI_HasProto(catchzh_fast)			\
@@ -637,6 +640,7 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(freeHaskellFunctionPtr)		\
       SymI_HasProto(freeStablePtr)		        \
       SymI_HasProto(getOrSetTypeableStore)		\
+      SymI_HasProto(getOrSetSignalHandlerStore)		\
       SymI_HasProto(gcdIntegerzh_fast)			\
       SymI_HasProto(gcdIntegerIntzh_fast)		\
       SymI_HasProto(gcdIntzh_fast)			\
@@ -653,6 +657,7 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(hs_free_stable_ptr)			\
       SymI_HasProto(hs_free_fun_ptr)			\
       SymI_HasProto(hs_hpc_rootModule)		        \
+      SymI_HasProto(hs_hpc_module)		        \
       SymI_HasProto(initLinker)				\
       SymI_HasProto(unpackClosurezh_fast)               \
       SymI_HasProto(getApStackValzh_fast)               \
@@ -690,6 +695,7 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(noDuplicatezh_fast)			\
       SymI_HasProto(atomicModifyMutVarzh_fast)		\
       SymI_HasProto(newPinnedByteArrayzh_fast)		\
+      SymI_HasProto(newAlignedPinnedByteArrayzh_fast)	\
       SymI_HasProto(newSpark)				\
       SymI_HasProto(orIntegerzh_fast)			\
       SymI_HasProto(performGC)				\
@@ -856,6 +862,7 @@ typedef struct _RtsSymbolVal {
       SymI_NeedsProto(rts_stop_on_exception)		\
       SymI_HasProto(stopTimer)				\
       SymI_HasProto(n_capabilities)			\
+      SymI_HasProto(traceCcszh_fast)                    \
       RTS_USER_SIGNALS_SYMBOLS
 
 #ifdef SUPPORT_LONG_LONGS
@@ -1048,6 +1055,16 @@ initLinker( void )
         mmap_32bit_base = (void*)RtsFlags.MiscFlags.linkerMemBase;
     }
 #endif
+
+#if defined(mingw32_HOST_OS)
+    /*
+     * These two libraries cause problems when added to the static link,
+     * but are necessary for resolving symbols in GHCi, hence we load
+     * them manually here.
+     */
+    addDLL("msvcrt");
+    addDLL("kernel32");
+#endif
 }
 
 /* -----------------------------------------------------------------------------
@@ -1744,7 +1761,7 @@ static int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first )
     if( m > n ) // we need to allocate more pages
     {
         oc->symbol_extras = mmapForLinker(sizeof(SymbolExtra) * count, 
-                                          MAP_ANONYMOUS, 0);
+                                          MAP_ANONYMOUS, -1);
     }
     else
     {
@@ -2651,8 +2668,7 @@ ocResolve_PEi386 ( ObjectCode* oc )
             copyName ( sym->Name, strtab, symbol, 1000-1 );
             S = (UInt32) lookupSymbol( symbol );
             if ((void*)S != NULL) goto foundit;
-	    /* Newline first because the interactive linker has printed "linking..." */
-            errorBelch("\n%s: unknown symbol `%s'", oc->fileName, symbol);
+            errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol);
             return 0;
            foundit:;
          }
@@ -4093,7 +4109,9 @@ static int relocateSection(
         
         char    *thingPtr = image + sect->offset + reloc->r_address;
         uint64_t thing;
-        uint64_t value;
+        /* We shouldn't need to initialise this, but gcc on OS X 64 bit
+           complains that it may be used uninitialized if we don't */
+        uint64_t value = 0;
         uint64_t baseValue;
         int type = reloc->r_type;