X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=b123f78dd2006822b58a31c3120b32d8af56d61f;hb=b3ff8a4ed1465034aba33490af69d24a8f295c09;hp=347bfa6446ec475810e14cb3ce55af5fadba3031;hpb=aaf192c3fba95ba4adf3e128551b7cb579890ad1;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index 347bfa6..b123f78 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -609,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)			\
@@ -1054,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
 }
 
 /* -----------------------------------------------------------------------------
@@ -3533,17 +3544,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;