0003-memdisk-Force-ld-output-format-to-32-bits.patch 980 B

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