From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, Peter Maydell <peter.maydell@linaro.org>,
berrange@redhat.com, Eduardo Habkost <ehabkost@redhat.com>,
stefanb@linux.vnet.ibm.com, richard.henderson@linaro.org,
f4bug@amsat.org, Max Filippov <jcmvbkbc@gmail.com>,
cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com,
pbonzini@redhat.com,
"open list:ARM TCG CPUs" <qemu-arm@nongnu.org>,
aurelien@aurel32.net, Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere
Date: Wed, 4 Sep 2019 21:29:35 +0100 [thread overview]
Message-ID: <20190904203013.9028-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190904203013.9028-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>
---
tests/tcg/aarch64/Makefile.softmmu-target | 4 ++--
tests/tcg/alpha/Makefile.softmmu-target | 4 ++--
tests/tcg/arm/Makefile.softmmu-target | 2 +-
tests/tcg/i386/Makefile.softmmu-target | 4 ++--
tests/tcg/minilib/Makefile.target | 2 +-
tests/tcg/xtensa/Makefile.softmmu-target | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
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-04 20:55 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 20:29 [Qemu-devel] [PATCH v1 00/42] current testing/next queue (podman, docker, ci) Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 01/42] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 02/42] configure: clean-up container cross compile detect Alex Bennée
2019-09-05 17:53 ` David Hildenbrand
2019-09-05 18:35 ` Alex Bennée
2019-09-05 18:37 ` David Hildenbrand
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 03/42] tests/docker: fix "cc" command to work with podman Alex Bennée
2019-09-04 23:31 ` John Snow
2019-09-05 9:51 ` Alex Bennée
2019-09-05 17:18 ` John Snow
2019-09-04 20:29 ` Alex Bennée [this message]
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 06/42] tests/tcg: move configuration to a sub-shell script Alex Bennée
2019-09-05 10:29 ` Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 07/42] tests/tcg: add .gitignore for in source builds Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 09/42] tests/docker: set DEF_TARGET_LIST for some containers Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 10/42] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-05 10:34 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster Alex Bennée
2019-09-05 10:35 ` Philippe Mathieu-Daudé
2019-09-07 11:26 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 12/42] tests/docker: move our powerpc " Alex Bennée
2019-09-07 11:32 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 13/42] tests/docker: move our Alpha " Alex Bennée
2019-09-07 11:23 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 14/42] tests/docker: move our HPPA " Alex Bennée
2019-09-07 11:22 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 15/42] tests/docker: move our m68k " Alex Bennée
2019-09-07 11:28 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 16/42] tests/docker: move our sparc64 " Alex Bennée
2019-09-07 11:27 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 17/42] tests/docker: move our sh4 " Alex Bennée
2019-09-07 11:23 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 18/42] tests/docker: move our mips64 " Alex Bennée
2019-09-06 19:05 ` Aleksandar Markovic
2019-09-07 11:33 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 19/42] tests/docker: move our riscv64 " Alex Bennée
2019-09-07 11:24 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 20/42] tests/docker: move our ppc64 " Alex Bennée
2019-09-07 11:29 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 21/42] tests/docker: drop debian-sid image Alex Bennée
2019-09-07 20:02 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 22/42] tests/docker: drop powerpc-user image for QEMU cross builds Alex Bennée
2019-09-07 20:21 ` Philippe Mathieu-Daudé
2019-09-09 9:54 ` Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 23/42] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES Alex Bennée
2019-09-07 12:06 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 24/42] tests/docker: add debian9-mxe " Alex Bennée
2019-09-05 10:36 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly Alex Bennée
2019-09-05 10:40 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps Alex Bennée
2019-09-07 11:40 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 28/42] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 29/42] configure: check if --no-pie is supported first Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 30/42] .travis.yml: Enable multiple caching features Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 31/42] .travis.yml: Increase cache timeout from 3min to 20min Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 32/42] .travis.yml: Cache Python PIP packages Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 33/42] .travis.yml: Cache Avocado cache Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 34/42] .travis.yml: Improve ccache use Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 35/42] .travis.yml: Enable ccache on OSX Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 36/42] .travis.yml: Document how the build matrix use caches Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 37/42] .travis.yml: Cache Linux/GCC 'debug profile' jobs together Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 38/42] .travis.yml: Cache Linux/GCC 'non-debug " Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 39/42] .travis.yml: Cache Linux/Clang " Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org" Alex Bennée
2019-09-05 10:33 ` Philippe Mathieu-Daudé
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 41/42] tests/docker: --disable-libssh on ubuntu1804 builds Alex Bennée
2019-09-05 10:32 ` Philippe Mathieu-Daudé
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output Alex Bennée
2019-09-04 22:16 ` [Qemu-devel] [PATCH v1 00/42] current testing/next queue (podman, docker, ci) no-reply
2019-09-06 10:20 ` Alex Bennée
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=20190904203013.9028-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=jcmvbkbc@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/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).