[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere |
Date: |
Tue, 10 Sep 2019 09:43:11 +0100 |
From: Paolo Bonzini <address@hidden>
For i386 specifically, this allows using the host GCC
to compile the i386 tests. But, it should really be
done for all targets, unless we want to pass $(EXTRA_CFLAGS)
directly as part of $(CC).
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/tcg/aarch64/Makefile.softmmu-target
b/tests/tcg/aarch64/Makefile.softmmu-target
index 2e560e4d08e..4c4aaf61dd3 100644
--- a/tests/tcg/aarch64/Makefile.softmmu-target
+++ b/tests/tcg/aarch64/Makefile.softmmu-target
@@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
.PRECIOUS: $(CRT_OBJS)
%.o: $(CRT_PATH)/%.S
- $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@
# Build and link the tests
%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
- $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
memory: CFLAGS+=-DCHECK_UNALIGNED=1
diff --git a/tests/tcg/alpha/Makefile.softmmu-target
b/tests/tcg/alpha/Makefile.softmmu-target
index 3c0f34cc692..09193a62d68 100644
--- a/tests/tcg/alpha/Makefile.softmmu-target
+++ b/tests/tcg/alpha/Makefile.softmmu-target
@@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
.PRECIOUS: $(CRT_OBJS)
%.o: $(CRT_PATH)/%.S
- $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@
# Build and link the tests
%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
- $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
memory: CFLAGS+=-DCHECK_UNALIGNED=0
diff --git a/tests/tcg/arm/Makefile.softmmu-target
b/tests/tcg/arm/Makefile.softmmu-target
index 49d48d8a1c3..2deb06e6e46 100644
--- a/tests/tcg/arm/Makefile.softmmu-target
+++ b/tests/tcg/arm/Makefile.softmmu-target
@@ -18,7 +18,7 @@ CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp
LDFLAGS+=-nostdlib -N -static
%: %.S %.ld
- $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld
+ $(CC) $(CFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -T
$(ARM_SRC)/$@.ld
# Specific Test Rules
diff --git a/tests/tcg/i386/Makefile.softmmu-target
b/tests/tcg/i386/Makefile.softmmu-target
index 0a4364868ce..cee342017e5 100644
--- a/tests/tcg/i386/Makefile.softmmu-target
+++ b/tests/tcg/i386/Makefile.softmmu-target
@@ -32,11 +32,11 @@ TESTS+=$(MULTIARCH_TESTS)
.PRECIOUS: $(CRT_OBJS)
%.o: $(CRT_PATH)/%.S
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
# Build and link the tests
%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
- $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
memory: CFLAGS+=-DCHECK_UNALIGNED=1
diff --git a/tests/tcg/minilib/Makefile.target
b/tests/tcg/minilib/Makefile.target
index 3ed8077d0f9..c821d2806a9 100644
--- a/tests/tcg/minilib/Makefile.target
+++ b/tests/tcg/minilib/Makefile.target
@@ -18,4 +18,4 @@ MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC)
.PRECIOUS: $(MINILIB_OBJS)
%.o: $(SYSTEM_MINILIB_SRC)/%.c
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
diff --git a/tests/tcg/xtensa/Makefile.softmmu-target
b/tests/tcg/xtensa/Makefile.softmmu-target
index 8212d96b81d..9530cac2ad9 100644
--- a/tests/tcg/xtensa/Makefile.softmmu-target
+++ b/tests/tcg/xtensa/Makefile.softmmu-target
@@ -34,9 +34,9 @@ $(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT)
Makefile.softmmu-target
# special rule for common blobs
%.o: %.S
- $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@
+ $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
%: %.S
- $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT)
+ $(CC) $(XTENSA_INC) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
$(NOSTDFLAGS) $(CRT)
endif
--
2.20.1
- [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching), Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 02/45] configure: clean-up container cross compile detect, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 01/45] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 05/45] tests/docker: handle missing encoding keyword for subprocess.check_output, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 10/45] tests/tcg: add .gitignore for in source builds, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 03/45] tests/docker: Use --userns=keep-id for podman, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 04/45] tests/docker: fix "cc" command to work with podman, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 16/45] tests/docker: move our Alpha cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere,
Alex Bennée <=
- [Qemu-devel] [PULL 13/45] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 18/45] tests/docker: move our m68k cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 08/45] tests/tcg: cleanup Makefile inclusions, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 15/45] tests/docker: move our powerpc cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 09/45] tests/tcg: move configuration to a sub-shell script, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 21/45] tests/docker: move our mips64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 32/45] tests/docker: --disable-libssh on ubuntu1804 builds, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 41/45] .travis.yml: Cache Linux/GCC 'debug profile' jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 22/45] tests/docker: move our riscv64 cross compile to Buster, Alex Bennée, 2019/09/10