aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot/map.c
diff options
context:
space:
mode:
Diffstat (limited to 'com32/mboot/map.c')
-rw-r--r--com32/mboot/map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/mboot/map.c b/com32/mboot/map.c
index b134a558..bdfcfcf0 100644
--- a/com32/mboot/map.c
+++ b/com32/mboot/map.c
@@ -157,7 +157,7 @@ int map_image(void *ptr, size_t len)
* This is insane, since it makes the AOUT_KLUDGE bit functionally
* useless, but at least Solaris apparently depends on this behavior.
*/
- if (eh) {
+ if (eh && !(opt.aout && mbh_len && (mbh->flags & MULTIBOOT_AOUT_KLUDGE))) {
regs.eip = eh->e_entry;
ph = (Elf32_Phdr *)(cptr+eh->e_phoff);