From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, famz@redhat.com, cota@braap.org,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v1 03/24] configure: move i386_cc to cross_cc_i386
Date: Tue, 10 Apr 2018 20:38:58 +0100 [thread overview]
Message-ID: <20180410193919.28026-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180410193919.28026-1-alex.bennee@linaro.org>
We should still be able to use the system cross compiler with the
appropriate flags on x86_64 hosts.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index b5f3b3fe29..add87ff4d4 100755
--- a/configure
+++ b/configure
@@ -284,7 +284,6 @@ libs_softmmu=""
libs_tools=""
audio_pt_int=""
audio_win_int=""
-cc_i386=i386-pc-linux-gnu-gcc
libs_qga=""
debug_info="yes"
stack_protector=""
@@ -457,6 +456,8 @@ docker="no"
cross_cc_aarch64="aarch64-linux-gnu-gcc"
cross_cc_arm="arm-linux-gnueabihf-gcc"
cross_cc_powerpc="powerpc-linux-gnu-gcc"
+cross_cc_i386="i386-pc-linux-gnu-gcc"
+cross_cc_i386_cflags=""
enabled_cross_compilers=""
@@ -687,12 +688,10 @@ case "$cpu" in
i386|i486|i586|i686|i86pc|BePC)
cpu="i386"
supported_cpu="yes"
- cross_cc_i386=gcc
;;
x86_64|amd64)
cpu="x86_64"
supported_cpu="yes"
- cross_cc_x86_64=gcc
;;
armv*b|armv*l|arm)
cpu="arm"
@@ -1435,7 +1434,6 @@ case "$cpu" in
i386)
CPU_CFLAGS="-m32"
LDFLAGS="-m32 $LDFLAGS"
- cc_i386='$(CC) -m32'
;;
x86_64)
# ??? Only extremely old AMD cpus do not have cmpxchg16b.
@@ -1443,12 +1441,14 @@ case "$cpu" in
# runtime and generate the fallback to serial emulation.
CPU_CFLAGS="-m64 -mcx16"
LDFLAGS="-m64 $LDFLAGS"
- cc_i386='$(CC) -m32'
+ cross_cc_i386=$cc
+ cross_cc_i386_cflags="-m32"
;;
x32)
CPU_CFLAGS="-mx32"
LDFLAGS="-mx32 $LDFLAGS"
- cc_i386='$(CC) -m32'
+ cross_cc_i386=$cc
+ cross_cc_i386_cflags="-m32"
;;
# No special flags required for other host CPUs
esac
@@ -6664,7 +6664,6 @@ echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
echo "IASL=$iasl" >> $config_host_mak
fi
-echo "CC_I386=$cc_i386" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
echo "CXX=$cxx" >> $config_host_mak
echo "OBJCC=$objcc" >> $config_host_mak
@@ -6783,6 +6782,7 @@ case "$target" in
esac
target_compiler=""
+target_compiler_cflags=""
mkdir -p $target_dir
echo "# Automatically generated by configure - do not modify" > $config_target_mak
@@ -6799,10 +6799,13 @@ TARGET_ABI_DIR=""
case "$target_name" in
i386)
gdb_xml_files="i386-32bit.xml i386-32bit-core.xml i386-32bit-sse.xml"
+ target_compiler=$cross_cc_i386
+ target_compiler_cflags=$cross_cc_i386_cflags
;;
x86_64)
TARGET_BASE_ARCH=i386
gdb_xml_files="i386-64bit.xml i386-64bit-core.xml i386-64bit-sse.xml"
+ target_compiler=$cross_cc_x86_64
;;
alpha)
mttcg="yes"
@@ -6947,7 +6950,7 @@ int main(void) {
}
EOF
- if ! do_compiler $target_compiler -o $TMPE $TMPC -static ; then
+ if ! do_compiler $target_compiler $target_compiler_cflags -o $TMPE $TMPC -static ; then
target_compiler=""
else
enabled_cross_compilers="${enabled_cross_compilers} ${target_compiler}"
@@ -7033,6 +7036,10 @@ if test -n "$target_compiler"; then
echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak
fi
+if test -n "$target_compiler_cflags"; then
+ echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >> $config_target_mak
+fi
+
# generate QEMU_CFLAGS/LDFLAGS for targets
cflags=""
--
2.16.2
next prev parent reply other threads:[~2018-04-10 19:39 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 19:38 [Qemu-devel] [PATCH v1 00/24] fix building of tests/tcg Alex Bennée
2018-04-10 19:38 ` [Qemu-devel] [PATCH v1 01/24] configure: add test for docker availability Alex Bennée
2018-04-11 8:50 ` Fam Zheng
2018-04-11 10:58 ` Alex Bennée
2018-04-11 12:59 ` Fam Zheng
2018-04-10 19:38 ` [Qemu-devel] [PATCH v1 02/24] configure: add support for --cross-cc-FOO Alex Bennée
2018-04-16 2:04 ` Philippe Mathieu-Daudé
2018-04-16 8:49 ` Alex Bennée
2018-04-10 19:38 ` Alex Bennée [this message]
2018-04-16 0:01 ` [Qemu-devel] [PATCH v1 03/24] configure: move i386_cc to cross_cc_i386 Philippe Mathieu-Daudé
2018-04-16 9:02 ` Alex Bennée
2018-04-16 10:30 ` Philippe Mathieu-Daudé
2018-04-10 19:38 ` [Qemu-devel] [PATCH v1 04/24] Makefile: Rename TARGET_DIRS to TARGET_LIST Alex Bennée
2018-04-12 14:33 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 05/24] docker: Add "cc" subcommand Alex Bennée
2018-04-16 1:48 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 06/24] docker: extend "cc" command to accept compiler Alex Bennée
2018-04-12 8:07 ` Fam Zheng
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 07/24] docker: allow "cc" command to run in user context Alex Bennée
2018-04-12 8:08 ` Fam Zheng
2018-04-16 0:02 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 08/24] docker: Makefile.include introduce DOCKER_SCRIPT Alex Bennée
2018-04-11 15:10 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 09/24] tests/tcg: move architecture independent tests into subdir Alex Bennée
2018-04-11 10:22 ` Thomas Huth
2018-04-16 0:05 ` Philippe Mathieu-Daudé
2018-04-16 9:01 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 10/24] tests/tcg/multiarch: Build fix for linux-test Alex Bennée
2018-04-11 10:25 ` Thomas Huth
[not found] ` <4bc22552-25b4-2a04-dc73-dc17201a2251@amsat.org>
[not found] ` <3b680ef4-3304-99d5-75ef-c4d5d570bb3a@amsat.org>
2018-04-16 8:51 ` Alex Bennée
2018-05-25 10:21 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 11/24] tests/tcg: move i386 specific tests into subdir Alex Bennée
2018-04-11 10:30 ` Thomas Huth
2018-04-16 0:08 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 12/24] tests/tcg/i386: Build fix for hello-i386 Alex Bennée
2018-04-11 10:30 ` Thomas Huth
2018-04-16 0:11 ` Philippe Mathieu-Daudé
2018-04-16 8:57 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 13/24] tests/tcg/i386: move test-i386-sse.c to tests/tcg/x86_64/test-sse.c Alex Bennée
2018-04-11 15:33 ` Thomas Huth
2018-04-11 16:19 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 14/24] tests/tcg/i386: fix test-i386 Alex Bennée
2018-04-11 15:36 ` Thomas Huth
2018-04-16 0:13 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 15/24] tests/tcg/i368: fix hello-i386 Alex Bennée
2018-04-11 15:38 ` Thomas Huth
2018-04-16 0:14 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 16/24] tests/tcg/i386: fix test-i386-fprem Alex Bennée
2018-04-11 15:14 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 17/24] tests/tcg: move ARM specific tests into subdir Alex Bennée
2018-04-11 15:40 ` Thomas Huth
2018-04-16 0:14 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 18/24] tests/tcg/arm: fix hello-arm Alex Bennée
2018-04-11 15:42 ` Thomas Huth
2018-04-16 1:28 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 19/24] tests/tcg: move MIPS specific tests into subdir Alex Bennée
2018-04-16 1:02 ` Philippe Mathieu-Daudé
2018-04-16 1:33 ` Philippe Mathieu-Daudé
2018-04-16 8:56 ` Alex Bennée
2018-04-16 10:21 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 20/24] tests/tcg: enable building for s390x Alex Bennée
2018-04-11 8:36 ` Cornelia Huck
2018-04-16 1:33 ` Philippe Mathieu-Daudé
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 21/24] tests/tcg: enable building for ppc64 Alex Bennée
2018-04-16 1:36 ` Philippe Mathieu-Daudé
2018-04-16 8:54 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 22/24] tests/tcg/Makefile: update to be called from Makefile.target Alex Bennée
2018-04-12 8:13 ` Fam Zheng
2018-04-12 8:47 ` Alex Bennée
2018-04-12 9:14 ` Fam Zheng
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 23/24] Makefile.target: add (clean-)guest-tests targets Alex Bennée
2018-04-16 1:12 ` Philippe Mathieu-Daudé
2018-04-16 1:52 ` Philippe Mathieu-Daudé
2018-04-16 8:53 ` Alex Bennée
2018-04-16 10:24 ` Philippe Mathieu-Daudé
2018-04-16 17:14 ` Philippe Mathieu-Daudé
2018-04-16 20:08 ` Alex Bennée
2018-04-17 14:41 ` Philippe Mathieu-Daudé
2018-04-17 15:09 ` Alex Bennée
2018-04-10 19:39 ` [Qemu-devel] [PATCH v1 24/24] tests/Makefile.include: add (clean-)check-tcg targets Alex Bennée
2018-04-16 1:53 ` Philippe Mathieu-Daudé
2018-04-10 20:07 ` [Qemu-devel] [PATCH v1 00/24] fix building of tests/tcg no-reply
2018-04-16 10:37 ` Philippe Mathieu-Daudé
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=20180410193919.28026-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=famz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.