[PULL,07/45] tests/tcg: use EXTRA_CFLAGS everywhere

Message ID	20190910084349.28817-8-alex.bennee@linaro.org
State	Accepted
Commit	6a9e0ef32a6b519a0c96d3dee5edc1321792c65a
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:11 +0100 Message-Id: <20190910084349.28817-8-alex.bennee@linaro.org> In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere Precedence: list Cc: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org, Max Filippov <jcmvbkbc@gmail.com>, "open list:ARM TCG CPUs" <qemu-arm@nongnu.org>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <rth@twiddle.net> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing updates (fixes, upgrades, caching) \| expand [PULL,00/45] testing updates (fixes, upgrades, caching) [PULL,01/45] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit [PULL,02/45] configure: clean-up container cross compile detect [PULL,03/45] tests/docker: Use --userns=keep-id for podman [PULL,04/45] tests/docker: fix "cc" command to work with podman [PULL,05/45] tests/docker: handle missing encoding keyword for subprocess.check_output [PULL,06/45] tests/docker: fix final missing .encode when parsing solibs [PULL,07/45] tests/tcg: use EXTRA_CFLAGS everywhere [PULL,08/45] tests/tcg: cleanup Makefile inclusions [PULL,09/45] tests/tcg: move configuration to a sub-shell script [PULL,10/45] tests/tcg: add .gitignore for in source builds [PULL,11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc [PULL,12/45] tests/docker: set DEF_TARGET_LIST for some containers [PULL,13/45] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES [PULL,14/45] tests/docker: move our arm64 cross compile to Buster [PULL,15/45] tests/docker: move our powerpc cross compile to Buster [PULL,16/45] tests/docker: move our Alpha cross compile to Buster [PULL,17/45] tests/docker: move our HPPA cross compile to Buster [PULL,18/45] tests/docker: move our m68k cross compile to Buster [PULL,19/45] tests/docker: move our sparc64 cross compile to Buster [PULL,20/45] tests/docker: move our sh4 cross compile to Buster [PULL,21/45] tests/docker: move our mips64 cross compile to Buster [PULL,22/45] tests/docker: move our riscv64 cross compile to Buster [PULL,23/45] tests/docker: move our ppc64 cross compile to Buster [PULL,24/45] tests/docker: update Debian Sid image [PULL,25/45] tests/docker: pin powerpc-user-cross to a snapshot [PULL,26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES [PULL,27/45] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES [PULL,28/45] tests/docker: avoid $SHELL invoke bash directly [PULL,29/45] tests/docker: add debian-amd64-cross for non-x86 hosts [PULL,30/45] tests/docker: use --arch-only for installing deps [PULL,31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 [PULL,32/45] tests/docker: --disable-libssh on ubuntu1804 builds [PULL,33/45] configure: check if --no-pie is supported first [PULL,34/45] .travis.yml: Enable multiple caching features [PULL,35/45] .travis.yml: Increase cache timeout from 3min to 20min [PULL,36/45] .travis.yml: Cache Python PIP packages [PULL,37/45] .travis.yml: Cache Avocado cache [PULL,38/45] .travis.yml: Improve ccache use [PULL,39/45] .travis.yml: Enable ccache on OSX [PULL,40/45] .travis.yml: Document how the build matrix use caches [PULL,41/45] .travis.yml: Cache Linux/GCC 'debug profile' jobs together [PULL,42/45] .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together [PULL,43/45] .travis.yml: Cache Linux/Clang jobs together [PULL,44/45] Fedora images: use URLs from stable "archives.fedoraproject.org" [PULL,45/45] travis.yml: Install libcap-dev for testing virito-9p

Message ID

20190910084349.28817-8-alex.bennee@linaro.org

State

Accepted

Commit

6a9e0ef32a6b519a0c96d3dee5edc1321792c65a

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Tue, 10 Sep 2019 09:43:11 +0100
Message-Id: <20190910084349.28817-8-alex.bennee@linaro.org>
In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org>
References: <20190910084349.28817-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere
Precedence: list
Cc: Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org, Max
	Filippov <jcmvbkbc@gmail.com>, "open list:ARM TCG CPUs"
	<qemu-arm@nongnu.org>,  Paolo Bonzini <pbonzini@redhat.com>,
	=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,
	Richard Henderson <rth@twiddle.net>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

testing updates (fixes, upgrades, caching) | expand

Commit Message

Alex Bennée Sept. 10, 2019, 8:43 a.m. UTC

From: Paolo Bonzini <pbonzini@redhat.com>


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 <pbonzini@redhat.com>

Message-Id: <20190807143523.15917-2-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.20.1

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

[PULL,07/45] tests/tcg: use EXTRA_CFLAGS everywhere

Commit Message

Patch