[syslinux:master] memdisk: Force ld output format to 32-bits

[syslinux-bot for Benoît Allard]

Commit-ID:  1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa
Gitweb:     http://www.syslinux.org/commit/1a2b87d279549cfae0f0e3c54a911d0b4e84f6fa
Author:     Benoît Allard <benoit.allard at greenbone.net>
AuthorDate: Wed, 5 Apr 2017 14:18:09 +0200
Committer:  Joakim Tjernlund <joakim.tjernlund at infinera.com>
CommitDate: Thu, 9 Nov 2017 16:12:20 +0100

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 at greenbone.net>

---
 memdisk/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 $@ $^