[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/46] configure: move i386_cc to cross_cc_i386
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v3 04/46] configure: move i386_cc to cross_cc_i386 |
Date: |
Tue, 24 Apr 2018 16:23:23 +0100 |
Also dont assume x86_64 compiler can build i386 binaries.
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
v2
- drop using system x86_64 compiler for i386 compiles
v3
- fix cross_cc_i386 when on i386
---
configure | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index caa838a0d0..ffd96d930f 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_cflags_i386=""
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,8 @@ case "$cpu" in
i386)
CPU_CFLAGS="-m32"
LDFLAGS="-m32 $LDFLAGS"
- cc_i386='$(CC) -m32'
+ cross_cc_i386=$cc
+ cross_cc_cflags_i386=$CPU_CFLAGS
;;
x86_64)
# ??? Only extremely old AMD cpus do not have cmpxchg16b.
@@ -1443,12 +1443,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_x86_64=$cc
+ cross_cc_cflags_x86_64=$CPU_CFLAGS
;;
x32)
CPU_CFLAGS="-mx32"
LDFLAGS="-mx32 $LDFLAGS"
- cc_i386='$(CC) -m32'
+ cross_cc_i386=$cc
+ cross_cc_cflags_i386="-m32"
;;
# No special flags required for other host CPUs
esac
@@ -6675,7 +6677,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
@@ -6794,6 +6795,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
@@ -6811,6 +6813,7 @@ 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_cflags_i386
;;
x86_64)
TARGET_BASE_ARCH=i386
@@ -6987,7 +6990,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}"
@@ -7071,8 +7074,13 @@ fi
if test -n "$target_compiler"; then
echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak
+
+ if test -n "$target_compiler_cflags"; then
+ echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >>
$config_target_mak
+ fi
fi
+
# generate QEMU_CFLAGS/LDFLAGS for targets
cflags=""
--
2.17.0
- [Qemu-devel] [PATCH v3 00/46] fix building of tests/tcg, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 02/46] configure: add test for docker availability, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 01/46] docker: add "probe" command for configure, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 03/46] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 05/46] configure: allow user to specify --cross-cc-cflags-foo=, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 06/46] configure: set cross_cc_FOO for host compiler, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 04/46] configure: move i386_cc to cross_cc_i386,
Alex Bennée <=
- [Qemu-devel] [PATCH v3 07/46] Makefile: Rename TARGET_DIRS to TARGET_LIST, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 09/46] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 11/46] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 08/46] docker: Add "cc" subcommand, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 10/46] docker: allow "cc" command to run in user context, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 34/46] tests/tcg: enable building for ppc64, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 12/46] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 33/46] tests/tcg: enable building for s390x, Alex Bennée, 2018/04/24
- [Qemu-devel] [PATCH v3 23/46] tests/tcg/x86_64: add Makefile.target, Alex Bennée, 2018/04/24