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.

31 lines
1.3 KiB

  1. From b6223a90ebbb5729e41b4fcb3bc9ac309ec04784 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] pc-bios: fix compilation when $(AS) is actually gcc driver
  5. ---
  6. pc-bios/optionrom/Makefile | 4 ++--
  7. 1 file changed, 2 insertions(+), 2 deletions(-)
  8. diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
  9. index e33a24da0d..ce734e8202 100644
  10. --- a/pc-bios/optionrom/Makefile
  11. +++ b/pc-bios/optionrom/Makefile
  12. @@ -34,7 +34,7 @@ endif
  13. QEMU_INCLUDES += -I$(SRC_PATH)
  14. Wa = -Wa,
  15. -ASFLAGS += -32
  16. +ASFLAGS += $(Wa)-32
  17. QEMU_CFLAGS += $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32)
  18. build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
  19. @@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
  20. %.o: %.S
  21. - $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@")
  22. + $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@ -x assembler -,"AS","$(TARGET_DIR)$@")
  23. pvh.img: pvh.o pvh_main.o
  24. $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@")