Fix #4867 (updated; corrects address calculation)

[ghc-hetmet.git] / rts / Linker.c

diff --git a/rts/Linker.c b/rts/Linker.c
index ee7a9c9..2a45aac 100644 (file)
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4690,7 +4690,12 @@ static int relocateSection(
         }
         else
         {
-           value = relocateAddress(oc, nSections, sections, reloc->r_address);
+           // If the relocation is not through the global offset table
+           // or external, then set the value to the baseValue.  This
+           // will leave displacements into the __const section
+           // unchanged (as they ought to be).
+
+           value = baseValue;
         }
 
         IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", (void *)value));