Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jberryman
GHC
Commits
12e3d3f4
Commit
12e3d3f4
authored
Jan 25, 2013
by
morabbin
Committed by
ian@well-typed.com
Jan 29, 2013
Browse files
Patch for #7628: improve error message when mixing 32 and 64 bit images (on Mac OS X)
parent
0768ddbd
Changes
1
Hide whitespace changes
Inline
Side-by-side
rts/Linker.c
View file @
12e3d3f4
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment