[commit: ghc] master: Revert "Fix 32-bit build failures" (18e71e4)
git at git.haskell.org
git at git.haskell.org
Tue Jul 5 07:37:23 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/18e71e460488785e520aa83d1de291c23e9f0042/ghc
>---------------------------------------------------------------
commit 18e71e460488785e520aa83d1de291c23e9f0042
Author: Simon Marlow <marlowsd at gmail.com>
Date: Tue Jul 5 08:40:52 2016 +0100
Revert "Fix 32-bit build failures"
This reverts commit 01f449f4ffd2c4f23bfe5698b9f1b98a86276900.
>---------------------------------------------------------------
18e71e460488785e520aa83d1de291c23e9f0042
rts/Linker.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/rts/Linker.c b/rts/Linker.c
index 40ea8de..894a31d 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1477,13 +1477,10 @@ void ghci_find(SymbolAddr *addr)
Section *section = &oc->sections[i];
if (addr > section->start &&
(StgWord)addr < (StgWord)section->start+section->size) {
- debugBelch("%p is in ", addr);
- if (oc->archiveMemberName) {
- debugBelch("%s", oc->archiveMemberName);
- } else {
- debugBelch("%" PATH_FMT, oc->fileName);
- }
- debugBelch(", section %d, offset %" FMT_Word "\n", i,
+ debugBelch("%p is in %" PATH_FMT, addr,
+ oc->archiveMemberName ?
+ oc->archiveMemberName : oc->fileName);
+ debugBelch(", section %d, offset %lx\n", i,
(StgWord)addr - (StgWord)section->start);
}
}
More information about the ghc-commits
mailing list