[commit: ghc] master: linker: Fix cast-to-uint64_t (0d94a3e)
git at git.haskell.org
git at git.haskell.org
Mon Jun 12 14:05:40 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/0d94a3e0dc23bfcdb23b14c1af059a19e9d636ac/ghc
>---------------------------------------------------------------
commit 0d94a3e0dc23bfcdb23b14c1af059a19e9d636ac
Author: Ben Gamari <ben at smart-cactus.org>
Date: Mon Jun 12 09:31:29 2017 -0400
linker: Fix cast-to-uint64_t
This broke on 32-bit platforms.
>---------------------------------------------------------------
0d94a3e0dc23bfcdb23b14c1af059a19e9d636ac
rts/linker/elf_got.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/linker/elf_got.c b/rts/linker/elf_got.c
index 41a7bd1..0395d16 100644
--- a/rts/linker/elf_got.c
+++ b/rts/linker/elf_got.c
@@ -116,7 +116,7 @@ verifyGot(ObjectCode * oc) {
ASSERT((void*)(*(void**)symbol->got_addr)
== (void*)symbol->addr);
}
- ASSERT(0 == ((uint64_t)symbol->addr & 0xffff000000000000));
+ ASSERT(0 == ((uintptr_t)symbol->addr & 0xffff000000000000));
}
}
return EXIT_SUCCESS;
More information about the ghc-commits
mailing list