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.

29 lines
978 B

  1. From 905f3b7b6115f303f964b5aa1d3bc9bdae9d5bec 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. --- a/pc-bios/optionrom/Makefile
  9. +++ b/pc-bios/optionrom/Makefile
  10. @@ -36,7 +36,7 @@ override CFLAGS += -m32 -include $(SRC_D
  11. endif
  12. Wa = -Wa,
  13. -override ASFLAGS += -32
  14. +override ASFLAGS += $(Wa)-32
  15. override CFLAGS += $(call cc-option, $(Wa)-32)
  16. LD_I386_EMULATION ?= elf_i386
  17. @@ -47,7 +47,7 @@ all: multiboot.bin linuxboot.bin linuxbo
  18. pvh.img: pvh.o pvh_main.o
  19. %.o: %.S
  20. - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
  21. + $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@ -x assembler -,"AS","$@")
  22. %.o: %.c
  23. $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")