X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=402721f1c74dbb6e4dd407793a3edb440a4130f6;hb=1bca92d715d8b358ee83ff5ee0bc085bec063e59;hp=ac06cda1a9fafb8f4617fca4b464a582dde175a6;hpb=d4a17c3a253d02c2ebf2315e71a29cb740278977;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index ac06cda..402721f 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 */
@@ -222,14 +222,10 @@ typedef struct _RtsSymbolVal {
     void   *addr;
 } RtsSymbolVal;
 
-#if !defined(PAR)
 #define Maybe_Stable_Names      SymI_HasProto(mkWeakzh_fast)			\
+      				SymI_HasProto(mkWeakForeignEnvzh_fast)		\
       				SymI_HasProto(makeStableNamezh_fast)		\
       				SymI_HasProto(finalizzeWeakzh_fast)
-#else
-/* These are not available in GUM!!! -- HWL */
-#define Maybe_Stable_Names
-#endif
 
 #if !defined (mingw32_HOST_OS)
 #define RTS_POSIX_ONLY_SYMBOLS                  \
@@ -492,7 +488,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) \
@@ -606,6 +604,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)			\
@@ -619,7 +618,6 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(complementIntegerzh_fast)		\
       SymI_HasProto(createAdjustor)			\
       SymI_HasProto(decodeDoublezh_fast)		\
-      SymI_HasProto(decodeFloatzh_fast)			\
       SymI_HasProto(decodeDoublezu2Intzh_fast)		\
       SymI_HasProto(decodeFloatzuIntzh_fast)		\
       SymI_HasProto(defaultsHook)			\
@@ -636,6 +634,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)			\
@@ -652,6 +651,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)               \
@@ -689,6 +689,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)				\
@@ -855,6 +856,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
@@ -1047,6 +1049,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
 }
 
 /* -----------------------------------------------------------------------------
@@ -1743,7 +1755,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
     {
@@ -2650,8 +2662,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:;
          }
@@ -3527,17 +3538,26 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
             w1 |= w2;
             *pP = w1;
             break;
+
          /* According to the Sun documentation:
             R_SPARC_UA32
             This relocation type resembles R_SPARC_32, except it refers to an
             unaligned word. That is, the word to be relocated must be treated
             as four separate bytes with arbitrary alignment, not as a word
             aligned according to the architecture requirements.
-
-            (JRS: which means that freeloading on the R_SPARC_32 case
-            is probably wrong, but hey ...)
          */
          case R_SPARC_UA32:
+            w2	= (Elf_Word)value;
+
+            // SPARC doesn't do misaligned writes of 32 bit words,
+	    //       so we have to do this one byte-at-a-time.
+	    char *pPc 	= (char*)pP;
+	    pPc[0]	= (char) ((Elf_Word)(w2 & 0xff000000) >> 24);
+	    pPc[1]	= (char) ((Elf_Word)(w2 & 0x00ff0000) >> 16);
+	    pPc[2]	= (char) ((Elf_Word)(w2 & 0x0000ff00) >> 8);
+	    pPc[3]	= (char) ((Elf_Word)(w2 & 0x000000ff));
+	    break;
+
          case R_SPARC_32:
             w2 = (Elf_Word)value;
             *pP = w2;
@@ -4092,7 +4112,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;