[commit: ghc] master: rts/Linker.c: Fix compile error on Arm (a70a6da)

git at git.haskell.org git at git.haskell.org
Sun May 22 09:43:57 UTC 2016


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

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

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

commit a70a6da91d982f9d966cc694e37cdbb807aeafe9
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun May 22 17:59:18 2016 +1000

    rts/Linker.c: Fix compile error on Arm
    
    Commit da3c1ebb8a left Arm with a compile error. This is a short term fixup
    pending a much more through fix of removing as much CPP hackery as possible.
    
    Test Plan: Validate on arm and x86_64
    
    Reviewers: simonmar, austin, hsyl20, bgamari, Phyx
    
    Reviewed By: Phyx
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2254


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

a70a6da91d982f9d966cc694e37cdbb807aeafe9
 rts/Linker.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rts/Linker.c b/rts/Linker.c
index e867d04..9deefca 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -5754,9 +5754,12 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
          IF_DEBUG(linker,debugBelch( "`%s' resolves to %p\n", symbol, (void*)S ));
       }
 
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) \
+    || defined(x86_64_HOST_ARCH)
       IF_DEBUG(linker,debugBelch("Reloc: P = %p   S = %p   A = %p\n",
                                         (void*)P, (void*)S, (void*)A ));
       checkProddableBlock(oc, (void*)P, sizeof(Elf_Word));
+#endif
 
 #if defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
       value = S + A;



More information about the ghc-commits mailing list