1*4882a593SmuzhiyunFrom c0287594239d5af2082cac20817f8e8b11a4b1b2 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
3*4882a593SmuzhiyunDate: Wed, 5 Apr 2017 14:18:09 +0200
4*4882a593SmuzhiyunSubject: [PATCH] memdisk: Force ld output format to 32-bits
5*4882a593SmuzhiyunMIME-Version: 1.0
6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8
7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunOn toolchains where the default output is x86_64, we need to be
10*4882a593Smuzhiyunconsistent with the other .o files
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunSigned-off-by: Benoît Allard <benoit.allard@greenbone.net>
13*4882a593Smuzhiyun---
14*4882a593Smuzhiyun memdisk/Makefile | 2 +-
15*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/memdisk/Makefile b/memdisk/Makefile
18*4882a593Smuzhiyunindex e6557d8..06613ff 100644
19*4882a593Smuzhiyun--- a/memdisk/Makefile
20*4882a593Smuzhiyun+++ b/memdisk/Makefile
21*4882a593Smuzhiyun@@ -78,7 +78,7 @@ memdisk16.o: memdisk16.asm
22*4882a593Smuzhiyun 	$(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun memdisk_%.o: memdisk_%.bin
25*4882a593Smuzhiyun-	$(LD) -r -b binary -o $@ $<
26*4882a593Smuzhiyun+	$(LD) --oformat elf32-i386 -r -b binary -o $@ $<
27*4882a593Smuzhiyun
28*4882a593Smuzhiyun memdisk16.elf: $(OBJS16)
29*4882a593Smuzhiyun 	$(LD) -Ttext 0 -o $@ $^
30*4882a593Smuzhiyun--
31*4882a593Smuzhiyun2.7.4
32*4882a593Smuzhiyun
33