From patchwork Fri Jun 8 12:32:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 137980 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp839634lji; Fri, 8 Jun 2018 05:58:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK9mEFya+EZ0Swh0KYAoC6yI1uWz3pro9AiXD1LzCQEcKACd/Mi1eQMQDHZ0v8ep5PQtz1U X-Received: by 2002:ac8:2a46:: with SMTP id l6-v6mr5961955qtl.118.1528462709754; Fri, 08 Jun 2018 05:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528462709; cv=none; d=google.com; s=arc-20160816; b=0LSnFDG2C3BY72cQv3R7EaKqTofSrhjDBycd2eLwIkPRq0/DRSDQ6IOEoCOAdYnC70 6g7mfTqG+wgEeLmvmFMKc9VRNdSnAv8Jc9eTP34oyhTlpSm2qkNBKNOlBTZpDLndovEd z2rVF9yDo9i9vxyUQl+Pu/VI3HTZBVLsc627QBmpCTVrtsOErkMIIZs7MIfaNPtL9Z17 ZFlOQuI3HYbmj+ssr1RtuZCIpA4n2e4YcngdYCzvzW3GmWClutqENUNp3uB5bNYQsVUR Bo7p0TOdJ90mQ9eOLFg2D7WfMUT9m9SVRlQJdFngVdwCO8QbLjkOWpW4NOHO1K+Cfmhl 0JEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=sqy9bOHemY7ddMLseDqEin9N8xk6rQLxrcu0LRusD1s=; b=kSXDfCHaX5jRrI6csQJ1GENKLRGK0Ij7A0Ad+jDzOkLpNNw+IgXMxNV1q+RCort5T0 rU/ulQt5lpzWQgLXhEZHPwa3tGyynmv8TcjmH3I8oA/BL04iFJwminwrm5XEzk3ZW3im KLCoU52mL5jvTxiZhtis64Vz1okOm8ucv+RDNeMRbcMzp51prWuLXe/zVpqJ83p9xAJ6 JKVVRIerOPZsaUBNtiMhGIpEh18FbtSeyF22d+YaVPCBK9MX3TYGL2l7PGaF3UaCBv80 PG7l8RtlUU9QBWspCt1LCjTffSwnDmNJTT2WNDWUMjvPBpbrcYCH+zDV/8Q+Um4+e0CS fNhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iDpaYfv8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 13-v6si3750288qtx.361.2018.06.08.05.58.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 05:58:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iDpaYfv8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGyL-0005HK-2z for patch@linaro.org; Fri, 08 Jun 2018 08:58:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGZt-00017g-5A for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGZr-00069o-4Y for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:13 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:44713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGZq-00069O-Ta for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:11 -0400 Received: by mail-wr0-x241.google.com with SMTP id x4-v6so5087911wro.11 for ; Fri, 08 Jun 2018 05:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sqy9bOHemY7ddMLseDqEin9N8xk6rQLxrcu0LRusD1s=; b=iDpaYfv86MDSiNyyqPF02v1if67+qY9fKdsMqSaJxByq9l5U/31gXI3scMg1sQ0I5r GaNlErBo33yyA5qKlLb8oKl0+KYUVeQbJDkVj2MghUrazXrOCKMOxCnZfrnIlvKUsu2Q wMHLKEiBZNkzhoNP8pPjauYLJLlXWG8Duumjc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sqy9bOHemY7ddMLseDqEin9N8xk6rQLxrcu0LRusD1s=; b=aAWsNCsa50mE4PsPoHpwcFFEHEjLqkmSLX4zXli/cwkE0O8N0pzgd0ekbFffhdV5wB +bLlsMkJHK3OO5RjokAu/zHVZqyI2X6nW32O986lrTCVSu5gL3nhhIicnv9AtPGKTSyq 8oZIUFeatpGYqx9Wt6ysb24zPYyAWalE/qVqN8h/owxwr2dirzmoYLFPgmKe2a4A0AiX 5CLkrDXXeP7UmAgeRxKzssl9PHHI0LOcY1SCG42iy/4VwiJJTyLtUZZXIS2E232MaeCz n3NHPeDkYrrRDhLkrc23MIlG9mFnnd+QsSou/8ShZRv5ilp03zTfyXBC4cvOPuI8lQQs p8dA== X-Gm-Message-State: APt69E3mWyjaLWnyTTmiAsAT18Ts1j0ypVPxdViwrbvfdr57ctk17SCa hSeViBqknw3T6zrVOWeTIXtwXQ== X-Received: by 2002:adf:af6b:: with SMTP id z98-v6mr5018309wrc.250.1528461189856; Fri, 08 Jun 2018 05:33:09 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t10-v6sm15799409wrq.74.2018.06.08.05.33.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:33:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3DF1A3E01CA; Fri, 8 Jun 2018 13:33:07 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:20 +0100 Message-Id: <20180608123307.24773-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH v6 02/49] configure: move i386_cc to cross_cc_i386 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Also dont assume x86_64 compiler can build i386 binaries. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- v2 - drop using system x86_64 compiler for i386 compiles v3 - fix cross_cc_i386 when on i386 v4 - fix merge conflicts - sort cross_cc defines --- configure | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/configure b/configure index 0121e4e9f4..6b59366e0d 100755 --- a/configure +++ b/configure @@ -289,7 +289,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="" @@ -461,6 +460,8 @@ docker="no" # cross compilers defaults, can be overridden with --cross-cc-ARCH cross_cc_aarch64="aarch64-linux-gnu-gcc" cross_cc_arm="arm-linux-gnueabihf-gcc" +cross_cc_i386="i386-pc-linux-gnu-gcc" +cross_cc_cflags_i386="" cross_cc_powerpc="powerpc-linux-gnu-gcc" enabled_cross_compilers="" @@ -1447,7 +1448,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. @@ -1455,12 +1457,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 @@ -6723,7 +6727,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 @@ -6844,6 +6847,7 @@ esac target_compiler="" target_compiler_static="" +target_compiler_cflags="" mkdir -p $target_dir echo "# Automatically generated by configure - do not modify" > $config_target_mak @@ -6861,6 +6865,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_ccflags_i386 ;; x86_64) TARGET_BASE_ARCH=i386 @@ -7033,9 +7038,9 @@ if has $target_compiler; then write_c_skeleton - if ! do_compiler $target_compiler -o $TMPE $TMPC -static ; then + if ! do_compiler $target_compiler $target_compiler_cflags -o $TMPE $TMPC -static ; then # For host systems we might get away with building without -static - if ! do_compiler $target_compiler -o $TMPE $TMPC ; then + if ! do_compiler $target_compiler $target_compiler_cflags -o $TMPE $TMPC ; then target_compiler="" else enabled_cross_compilers="${enabled_cross_compilers} ${target_compiler}" @@ -7128,8 +7133,13 @@ if test -n "$target_compiler"; then if test -n "$target_compiler_static"; then echo "CROSS_CC_GUEST_STATIC=$target_compiler_static" >> $config_target_mak fi + + 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=""