diff options
| author | Andy Adams-Moran <andy.adamsmoran@gmail.com> | 2013-01-25 11:11:01 -0800 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-01-29 16:00:12 +0000 |
| commit | 12e3d3f4690d76b57ca70cdfdbad049fabd79bde (patch) | |
| tree | 7c727d3c20c8d4c4b2b1a1d015904746dbdc55ec /rts/Linker.c | |
| parent | 0768ddbdf39a1d713b5154e5952b7f0757743010 (diff) | |
| download | haskell-12e3d3f4690d76b57ca70cdfdbad049fabd79bde.tar.gz | |
Patch for #7628: improve error message when mixing 32 and 64 bit images (on Mac OS X)
Diffstat (limited to 'rts/Linker.c')
| -rw-r--r-- | rts/Linker.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index b97a30ca86..39b7897c94 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -5523,14 +5523,18 @@ ocVerifyImage_MachO(ObjectCode * oc) #if x86_64_HOST_ARCH || powerpc64_HOST_ARCH if(header->magic != MH_MAGIC_64) { - errorBelch("%s: Bad magic. Expected: %08x, got: %08x.\n", - oc->fileName, MH_MAGIC_64, header->magic); + errorBelch("Could not load image %s: bad magic!\n" + " Expected %08x (64bit), got %08x%s\n", + oc->fileName, MH_MAGIC_64, header->magic, + header->magic == MH_MAGIC ? " (32bit)." : "."); return 0; } #else if(header->magic != MH_MAGIC) { - errorBelch("%s: Bad magic. Expected: %08x, got: %08x.\n", - oc->fileName, MH_MAGIC, header->magic); + errorBelch("Could not load image %s: bad magic!\n" + " Expected %08x (32bit), got %08x%s\n", + oc->fileName, MH_MAGIC, header->magic, + header->magic == MH_MAGIC_64 ? " (64bit)." : "."); return 0; } #endif |