projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document -fwarn-missing-import-lists
[ghc-hetmet.git]
/
rts
/
Linker.c
diff --git
a/rts/Linker.c
b/rts/Linker.c
index
fd5c158
..
2a45aac
100644
(file)
--- a/
rts/Linker.c
+++ b/
rts/Linker.c
@@
-40,6
+40,7
@@
#include <sys/types.h>
#endif
#include <sys/types.h>
#endif
+#include <inttypes.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@
-4652,8
+4653,8
@@
static int relocateSection(
}
IF_DEBUG(linker,
}
IF_DEBUG(linker,
- debugBelch("relocateSection: length = %d, thing = %d, baseValue = %p\n",
- reloc->r_length, thing, baseValue));
+ debugBelch("relocateSection: length = %d, thing = %" PRId64 ", baseValue = %p\n",
+ reloc->r_length, thing, (char *)baseValue));
if (type == X86_64_RELOC_GOT
|| type == X86_64_RELOC_GOT_LOAD)
if (type == X86_64_RELOC_GOT
|| type == X86_64_RELOC_GOT_LOAD)
@@
-4689,9
+4690,12
@@
static int relocateSection(
}
else
{
}
else
{
- value = sections[reloc->r_symbolnum-1].offset
- - sections[reloc->r_symbolnum-1].addr
- + (uint64_t) image;
+ // 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));
}
IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", (void *)value));