You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

35 lines
1.2 KiB

  1. From b6d4bff30f2bdc3a6f26c9f6c7f32e352270d119 Mon Sep 17 00:00:00 2001
  2. From: Yousong Zhou <yszhou4tech@gmail.com>
  3. Date: Sat, 24 Feb 2018 13:46:31 +0800
  4. Subject: [PATCH 3/3] pc-bios: fix compilation when $(AS) is actually gcc
  5. driver
  6. ---
  7. pc-bios/optionrom/Makefile | 4 ++--
  8. 1 file changed, 2 insertions(+), 2 deletions(-)
  9. diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
  10. index a9a9e5e..f88b3ee 100644
  11. --- a/pc-bios/optionrom/Makefile
  12. +++ b/pc-bios/optionrom/Makefile
  13. @@ -34,7 +34,7 @@ endif
  14. QEMU_INCLUDES += -I$(SRC_PATH)
  15. Wa = -Wa,
  16. -ASFLAGS += -32
  17. +ASFLAGS += $(Wa)-32
  18. QEMU_CFLAGS += $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32)
  19. build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin
  20. @@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin
  21. %.o: %.S
  22. - $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@")
  23. + $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@ -x assembler -,"AS","$(TARGET_DIR)$@")
  24. %.img: %.o
  25. $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@")
  26. --
  27. 1.8.3.1