[syslinux:master] memdisk: Force ld output format to 32-bits
syslinux-bot for Benoît Allard
benoit.allard at greenbone.net
Thu Nov 23 06:15:08 PST 2017
Commit-ID: c05fde2f0f71e480fe3e5941150d9a354acabc22
Gitweb: http://www.syslinux.org/commit/c05fde2f0f71e480fe3e5941150d9a354acabc22
Author: Benoît Allard <benoit.allard at greenbone.net>
AuthorDate: Wed, 5 Apr 2017 14:18:09 +0200
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Thu, 23 Nov 2017 08:52:51 -0500
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 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 $@ $^
More information about the Syslinux-commits
mailing list