Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/117c4a834a49afdd73527ec68dadf7348f6cf4e9 >--------------------------------------------------------------- commit 117c4a834a49afdd73527ec68dadf7348f6cf4e9 Author: Ian Lynagh <[email protected]> Date: Mon Apr 30 20:37:29 2012 +0100 Fixes for x86/Linux >--------------------------------------------------------------- rts/Linker.c | 8 ++++---- rts/posix/OSMem.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rts/Linker.c b/rts/Linker.c index 31a7e75..a2c54c5 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1684,7 +1684,7 @@ mmap_again: MAP_PRIVATE|TRY_MAP_32BIT|fixed|flags, fd, 0); if (result == MAP_FAILED) { - sysErrorBelch("mmap %lu bytes at %p",(lnat)size,map_addr); + sysErrorBelch("mmap %" FMT_SizeT " bytes at %p",(lnat)size,map_addr); errorBelch("Try specifying an address with +RTS -xm<addr> -RTS"); stg_exit(EXIT_FAILURE); } @@ -1727,7 +1727,7 @@ mmap_again: } #endif - IF_DEBUG(linker, debugBelch("mmapForLinker: mapped %lu bytes starting at %p\n", (lnat)size, result)); + IF_DEBUG(linker, debugBelch("mmapForLinker: mapped %" FMT_SizeT " bytes starting at %p\n", (lnat)size, result)); IF_DEBUG(linker, debugBelch("mmapForLinker: done\n")); return result; } @@ -4668,7 +4668,7 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, # endif // arm_HOST_ARCH default: - errorBelch("%s: unhandled ELF relocation(Rel) type %lu\n", + errorBelch("%s: unhandled ELF relocation(Rel) type %" FMT_SizeT "\n", oc->fileName, (lnat)ELF_R_TYPE(info)); return 0; } @@ -4962,7 +4962,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, #endif default: - errorBelch("%s: unhandled ELF relocation(RelA) type %lu\n", + errorBelch("%s: unhandled ELF relocation(RelA) type %" FMT_SizeT "\n", oc->fileName, (lnat)ELF_R_TYPE(info)); return 0; } diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index bfe1296..509fc5e 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -122,7 +122,7 @@ my_mmap (void *addr, lnat size) (errno == EINVAL && sizeof(void*)==4 && size >= 0xc0000000)) { // If we request more than 3Gig, then we get EINVAL // instead of ENOMEM (at least on Linux). - errorBelch("out of memory (requested %lu bytes)", size); + errorBelch("out of memory (requested %" FMT_SizeT " bytes)", size); stg_exit(EXIT_FAILURE); } else { barf("getMBlock: mmap: %s", strerror(errno)); _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
