[commit: ghc] master: Linker(ELF): Fix addProddableBlocks usage (909bbdb)
git at git.haskell.org
git at git.haskell.org
Sun Dec 27 00:42:41 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd/ghc
>---------------------------------------------------------------
commit 909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Sun Dec 27 01:13:39 2015 +0100
Linker(ELF): Fix addProddableBlocks usage
The range marked as proddable didn't actually match the range that we
mapped. This fixed `ghc-api/T8628` et al on ARM.
Test Plan: Validate
Reviewers: austin, erikd
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1700
GHC Trac Issues: #11289
>---------------------------------------------------------------
909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd
rts/Linker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/Linker.c b/rts/Linker.c
index e411e4d..3bd12b3 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4809,7 +4809,7 @@ ocGetNames_ELF ( ObjectCode* oc )
if (start == NULL) goto fail;
alloc = SECTION_MMAP;
}
- addProddableBlock(oc, ehdrC + offset, size);
+ addProddableBlock(oc, start, size);
}
addSection(§ions[i], kind, alloc, start, size,
More information about the ghc-commits
mailing list