Skip to content

Commit

Permalink
memdisk: Force ld output format to 32-bits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benoît Allard authored and geneC committed Nov 23, 2017
1 parent 1efb5bf commit c05fde2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion memdisk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@ $^
Expand Down

0 comments on commit c05fde2

Please sign in to comment.