aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorBenoît Allard <benoit.allard@greenbone.net>2017-04-05 14:18:09 +0200
committerJoakim Tjernlund <joakim.tjernlund@infinera.com>2017-11-09 16:12:20 +0100
commit1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa (patch)
tree7412b0fbd7ff236b9449dc78b014ff309af83127 /memdisk
parent1efb5bfe949b41d16054ae856914388f1afa23d1 (diff)
downloadsyslinux-1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa.tar.gz
syslinux-1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa.tar.xz
syslinux-1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa.zip
memdisk: Force ld output format to 32-bits
On toolchains where the default output is x86_64, we need to be consistent with the other .o files Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 42e56e00..ccd5738b 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -78,7 +78,7 @@ memdisk16.o: memdisk16.asm
$(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
memdisk_%.o: memdisk_%.bin
- $(LD) -r -b binary -o $@ $<
+ $(LD) --oformat elf32-i386 -r -b binary -o $@ $<
memdisk16.elf: $(OBJS16)
$(LD) -Ttext 0 -o $@ $^