[commit: ghc] master: Fix 32-bit build failures (01f449f)

git at git.haskell.org git at git.haskell.org
Mon Jul 4 12:13:20 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/01f449f4ffd2c4f23bfe5698b9f1b98a86276900/ghc

>---------------------------------------------------------------

commit 01f449f4ffd2c4f23bfe5698b9f1b98a86276900
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jul 4 10:56:04 2016 +0100

    Fix 32-bit build failures


>---------------------------------------------------------------

01f449f4ffd2c4f23bfe5698b9f1b98a86276900
 rts/Linker.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 894a31d..40ea8de 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1477,10 +1477,13 @@ 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 %" PATH_FMT, addr,
-                           oc->archiveMemberName ?
-                             oc->archiveMemberName : oc->fileName);
-                debugBelch(", section %d, offset %lx\n", i,
+                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,
                            (StgWord)addr - (StgWord)section->start);
             }
         }



More information about the ghc-commits mailing list