From: "Alex Bennée" <alex.bennee@linaro.org>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 1/3] tests/tcg: use EXTRA_CFLAGS everywhere
Date: Mon, 02 Sep 2019 15:51:54 +0100 [thread overview]
Message-ID: <87imqa7nud.fsf@linaro.org> (raw)
In-Reply-To: <20190807143523.15917-2-pbonzini@redhat.com>
Paolo Bonzini <pbonzini@redhat.com> writes:
> 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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> 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 2e560e4d08..4c4aaf61dd 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 3c0f34cc69..09193a62d6 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 49d48d8a1c..2deb06e6e4 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 0a4364868c..cee342017e 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 3ed8077d0f..c821d2806a 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 8212d96b81..9530cac2ad 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
--
Alex Bennée
next prev parent reply other threads:[~2019-09-02 14:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 14:35 [Qemu-devel] [PATCH v2 0/3] tests/tcg: disentangle makefiles Paolo Bonzini
2019-08-07 14:35 ` [Qemu-devel] [PATCH v2 1/3] tests/tcg: use EXTRA_CFLAGS everywhere Paolo Bonzini
2019-09-02 14:51 ` Alex Bennée [this message]
2019-08-07 14:35 ` [Qemu-devel] [PATCH v2 2/3] tests/tcg: cleanup Makefile inclusions Paolo Bonzini
2019-08-07 14:35 ` [Qemu-devel] [PATCH v2 3/3] tests/tcg: move configuration to a sub-shell script Paolo Bonzini
2019-08-07 14:58 ` [Qemu-devel] [PATCH v2 0/3] tests/tcg: disentangle makefiles no-reply
2019-09-04 13:32 ` Paolo Bonzini
2019-09-04 14:27 ` Alex Bennée
2019-09-09 17:01 ` Paolo Bonzini
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=87imqa7nud.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).