[commit: ghc] master: fix rts/Linker compilation issues on AMD64/Solaris platform (5931ee8)

Simon Marlow marlowsd at gmail.com
Thu Jan 24 10:57:49 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5931ee8e40f8137fea619e0a7d0018dbe03c331e

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

commit 5931ee8e40f8137fea619e0a7d0018dbe03c331e
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jan 23 10:23:08 2013 +0000

    fix rts/Linker compilation issues on AMD64/Solaris platform
    
    Submitted by: Karel Gardas <karel.gardas at centrum.cz>

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

 rts/Linker.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index fa1de89..b97a30c 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4088,6 +4088,7 @@ ocResolve_PEi386 ( ObjectCode* oc )
 #elif defined(x86_64_HOST_ARCH)
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
+#  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
 #elif defined(powerpc64_HOST_ARCH)
 #  define ELF_64BIT
 #endif





More information about the ghc-commits mailing list