[syslinux] [PATCH 1/2] memdisk: Force ld output format to 32-bits

Benoît Allard
Wed, 05 Apr 2017 14:32:05 -0000

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 42e56e0..ccd5738 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 $@ $^
--
2.1.4