diff options
| author | Richard Henderson <rth@twiddle.net> | 2016-07-07 21:49:36 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2016-07-10 10:05:46 -0700 |
| commit | cdbd727c20ad7aac7797dc8c95e485e1a4c6901b (patch) | |
| tree | 31cfc311911c1ba23ce44fde29aa68445b7fd75b /pc-bios | |
| parent | 4aa3f4dd5bb9c2282627bf99d85eff61b325beb0 (diff) | |
| download | qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.zip qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.gz qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.bz2 | |
build: Use $(AS) for optionrom explicitly
For clang before 3.5, -fno-integrated-as does not exist,
so the workaround in 5f6f0e27fb24 fails to build.
Use clang's default assembler for linux-user/safe-syscall.S,
and explicitly change to use the system assembler for the
option roms.
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/optionrom/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index ce4852a..2cdda87 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -20,6 +20,9 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin # suppress auto-removal of intermediate files .SECONDARY: +%.o: %.S + $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@," AS $(TARGET_DIR)$@") + %.img: %.o $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") |