[Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
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>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere
Date: Tue, 10 Sep 2019 09:43:11 +0100	[thread overview]
Message-ID: <20190910084349.28817-8-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org>

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>

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

next prev parent reply	other threads:[~2019-09-10  8:57 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10  8:43 [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching) Alex Bennée
2019-09-10  8:43 ` [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  8:43 ` [Qemu-devel] [PULL 02/45] configure: clean-up container cross compile detect Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 03/45] tests/docker: Use --userns=keep-id for podman Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 04/45] tests/docker: fix "cc" command to work with podman Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 05/45] tests/docker: handle missing encoding keyword for subprocess.check_output Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs Alex Bennée
2019-09-10  8:43 ` Alex Bennée [this message]
2019-09-10  8:43 ` [Qemu-devel] [PULL 08/45] tests/tcg: cleanup Makefile inclusions Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 09/45] tests/tcg: move configuration to a sub-shell script Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 10/45] tests/tcg: add .gitignore for in source builds Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 13/45] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to Buster Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 15/45] tests/docker: move our powerpc " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 16/45] tests/docker: move our Alpha " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 18/45] tests/docker: move our m68k " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 19/45] tests/docker: move our sparc64 " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 20/45] tests/docker: move our sh4 " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 21/45] tests/docker: move our mips64 " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 22/45] tests/docker: move our riscv64 " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directly Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 Alex Bennée
2019-09-19 20:18   ` Philippe Mathieu-Daudé
2019-09-20  6:23     ` Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 32/45] tests/docker: --disable-libssh on ubuntu1804 builds Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 38/45] .travis.yml: Improve ccache use Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 41/45] .travis.yml: Cache Linux/GCC 'debug profile' jobs together Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 42/45] .travis.yml: Cache Linux/GCC 'non-debug " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang " Alex Bennée
2019-09-10  8:43 ` [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org" Alex Bennée
2019-09-10  9:07   ` Daniel P. Berrangé
2019-09-10  9:37     ` Alex Bennée
2019-09-10  9:39     ` Peter Maydell
2019-09-10 11:11     ` Philippe Mathieu-Daudé
2019-09-10  8:43 ` [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p Alex Bennée
2019-09-10  9:58 ` [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching) Peter Maydell
2019-09-10 11:27   ` Alex Bennée
2019-09-10 11:30     ` Peter Maydell

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2e560e4d08 dfblob:4c4aaf61dd dfblob:3c0f34cc69
dfblob:09193a62d6 dfblob:49d48d8a1c dfblob:2deb06e6e4 dfblob:0a4364868c
dfblob:cee342017e dfblob:3ed8077d0f dfblob:c821d2806a dfblob:8212d96b81
dfblob:9530cac2ad )
 OR (
bs:"[Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190910084349.28817-8-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=ehabkost@redhat.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).