X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=68bd5864a1bb7ceb32782dc55dfba90c6a6ec271;hb=85df606a23117641682e19f3851099134e5f77a4;hp=d41ede6e1055cb4b7fa1b8e5b270da998ef47ddd;hpb=6d13a90527ff607bd969a0f9af70a32c3316ae9b;p=ghc-hetmet.git

diff --git a/rts/Linker.c b/rts/Linker.c
index d41ede6..68bd586 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -222,15 +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                  \
@@ -595,8 +590,6 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(OnExitHook)				\
       SymI_HasProto(OutOfHeapHook)			\
       SymI_HasProto(StackOverflowHook)			\
-      SymI_HasProto(__encodeDouble)			\
-      SymI_HasProto(__encodeFloat)			\
       SymI_HasProto(addDLL)               		\
       GMP_SYMS					        \
       SymI_HasProto(__int_encodeDouble)			\
@@ -623,7 +616,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)			\
@@ -760,6 +752,7 @@ typedef struct _RtsSymbolVal {
       SymI_HasProto(rts_mkWord32)			\
       SymI_HasProto(rts_mkWord64)			\
       SymI_HasProto(rts_unlock)				\
+      SymI_HasProto(rts_unsafeGetMyCapability)          \
       SymI_HasProto(rtsSupportsBoundThreads)		\
       SymI_HasProto(__hscore_get_saved_termios)		\
       SymI_HasProto(__hscore_set_saved_termios)		\
@@ -3544,17 +3537,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;