From patchwork Thu May 17 17:46:33 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: 136164 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp236466lji; Thu, 17 May 2018 10:48:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpjZ7pghRlt8G2Pq+as2a1mKiDqTzXkLLLqe3+vs2wlPk/oyFb1vTEbxrVWduHNQJBnNtOt X-Received: by 2002:ac8:3fee:: with SMTP id v43-v6mr6547310qtk.64.1526579283190; Thu, 17 May 2018 10:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579283; cv=none; d=google.com; s=arc-20160816; b=yZUxbiQi/BGrJ5bZ/EMZ1N1EWs3lNTaaJxa3kSo6UL83OcrZtOgsv0gU1Hkit9HVvz ODE9On//ddbh+TpwdwooN5f60OLwrODLoCA517PLv4hhDBzLt2OGp+YKfO1LsVZ4rStE JK88tPgywERkHQKDzDc8G6ZKOR34AdYSuZC8BMXcvrmHqGnRN3YxuvGD8Ovk8Rogoqbi AaITCC1pt3BZkmcHTt/eBsoUVf1kxhhlbjWpcKmcNXG9FtU3LZRt4MwaF4v0P2pqHj0d qekrjhlN/jduwbPcvrahbIIfh91leJDf7nCorwo8wIqJQ/btZUoJdLwFdWcRrMVma6S1 3R4g== 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=ekMjpsQ6iTu6lMMBjr+Bup4NeTHyvGSjcaDS4ozBOGA=; b=aRt6bA7ZKNFhesGJMCvk92gMKJkJbmsq6k82F9ho6Bx5zW03RSeJp3riGFj2g3evQz pqLZ9g/KxyV/lp7fS4dHtNZQyaE30OHx1qiubmFXHmSB+upO4vZIuAMm5bRMyuzMqk26 8PKVpCR+9bKdIZwwNI3ZIqVBdzm4PSCu69uBFhEoidfjGUWw5xv0IrXofRsHKZj6TdEf JBvJnoJVcpL6N5lxLJVoQ/FEa4EOj8QTsbOrL69KcOO/qnYFQWyAAmZvXPLVDzXQ2IkX eQIxQ9OXEGDmcgMziqPpI37oKmQ/hh3kqKVYkEwycTF17Z9DugB3XuerT7xiqW9GsZTW 5+/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=irRzgfb8; 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 j3-v6si861901qvo.128.2018.05.17.10.48.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:48:03 -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=irRzgfb8; 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]:38427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN0U-0006F2-Kt for patch@linaro.org; Thu, 17 May 2018 13:48:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJMzu-0006Dh-3J for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJMzs-0003RK-PR for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:26 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:42580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJMzs-0003Qx-J5 for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:24 -0400 Received: by mail-wr0-x242.google.com with SMTP id t16-v6so3367596wrm.9 for ; Thu, 17 May 2018 10:47:24 -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=ekMjpsQ6iTu6lMMBjr+Bup4NeTHyvGSjcaDS4ozBOGA=; b=irRzgfb86ZFZLLYTRUnkvvdrTbEr245V+MeytcREFyw/4vSc9QcevWz3bi/0S0wn1O kxd3NMgFnZiuDEKc8k6cS4/cxqgTx33PX3g7hmGBnJcpF98JFVGS7AJD0xsOCUjsH+Fn ErHsbO5RtVbYcFU4cPZ6OxZSqDx0XNQfFdQkA= 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=ekMjpsQ6iTu6lMMBjr+Bup4NeTHyvGSjcaDS4ozBOGA=; b=iNGqc2AUrx9tBqX4YiAsp9xDS4eAf9HWRulvN2ygtSrSfcjE/9WAQJ/vKQNY+G3mZ8 D12KAvTCR8FFsm2RYZVFvk0IwfQhdtbbVCAc++WKGjLzZe8j6yIa3egH9urhOzxv/Iiq XhpD033EuEcswVqIGWQ9t8MSS7NGq+xCu88yH/0kUpNtSxhizEfYOAcHB6Umb0B72EI6 hI6GInPwJ1hgXHQYqvZblm8xesKcqDVLPB98Co/vmDz3p64vpCy8Iht6el8cYTkEmlL3 kwYf7nfv0KnELc39JZ6shZEjFSpvIAyLmjK4czD05bsmgRSoxYyVtEmEu5CglEooCdLF B18g== X-Gm-Message-State: ALKqPwcruab8rDYBasEL2DOvePtKmfVm+/TMx0kqWyTNQ0CHJCRxPQO1 R54njL/EvVhGMCWVUMRf2puhLQ== X-Received: by 2002:adf:c08a:: with SMTP id d10-v6mr4798216wrf.268.1526579243398; Thu, 17 May 2018 10:47:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o15-v6sm5186558wrj.13.2018.05.17.10.47.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:47:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 183363E0D76; Thu, 17 May 2018 18:47:19 +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 Date: Thu, 17 May 2018 18:46:33 +0100 Message-Id: <20180517174718.10107-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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::242 Subject: [Qemu-devel] [PATCH v4 04/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.0 diff --git a/configure b/configure index b21e6ce6ac..52a5d747e4 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 @@ -6714,7 +6718,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 @@ -6835,6 +6838,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 @@ -6852,6 +6856,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 @@ -7023,9 +7028,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}" @@ -7118,8 +7123,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=""