From patchwork Tue Jun 19 15:43:41 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: 139167 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5376035lji; Tue, 19 Jun 2018 08:55:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI+S+itidhxXcUA+5G3WJu6dKheVq0Wx30rHr7OU9YkwNJhNDPKIeV+qVgkCkWUhrDvfDtI X-Received: by 2002:a37:6d03:: with SMTP id i3-v6mr14562953qkc.34.1529423703403; Tue, 19 Jun 2018 08:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529423703; cv=none; d=google.com; s=arc-20160816; b=laIlxnyDTsvZZXSJwnba12OFsU/l9bctbrc6ni3+Dlx2bDNjj2EEpjvnPrs02qbaNq EW3yhYHF1boY8Lo9EpOkXh08X/MLEjkpNzUQyi+DQPwvY9CEnXX2S3P5DFf+BvRunzem qO1PhurCpIcFcgsxAbqo6hEH/7sfW1EH1oT3vme+TBSn11tFDbOfQmIvFgKR0IVGVCMQ Bv2xWA3f6yUVnukUl/MVrKtwkdNUmhb3JKxdChK+w2zBM7lI5n5Pu7NtzgzqWRiZq+9T qGcp2DQneL02a0ofAxA+5GCgAsUiDm5CYJZSpuIFP+aOrpnmTe4PtX6POKFk0kXefj+d R+5A== 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=a382plahQ2poUqc2xxWA00puTkun/ceu60ki1dROSyQ=; b=gFWubj3YXmifcS38PqiVTqXGjRkk0pXRxCsRkcqs0FDbKR2M8nqsclLNjAFvr2p0ik bOAGFPF49VFQH1okqgDXO0IOV8rl4jDFMq3Ypd/4tCXBAoqlEH3iW0tqFML39V6QBK6D vfpun47DZK0dSKyCNBLb03Wra+EUl3MFSoil/pcAGm7BhbygrT0OyNsbJUMqSbbOBeGY fWsnxHxP0YHY2yTrZibFNen99LlYkxKbp8nIhYsMS47UctdrR5aeUnOsPVtgLsIEokxv 0l+4D6KMIVrJtupPWkXZgfus57lwWFzJdoGZeL92Ln6kMiqe5s9JxH20+H3X0ZNwubWF AfBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fYpa/43G"; 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 h15-v6si12146qvm.259.2018.06.19.08.55.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 08:55: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="fYpa/43G"; 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]:43376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIyE-0005O9-RQ for patch@linaro.org; Tue, 19 Jun 2018 11:55:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIoD-0006Ur-UH for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIoB-0006Jg-Hw for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:41 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIoB-0006JG-C5 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:39 -0400 Received: by mail-wm0-x241.google.com with SMTP id j15-v6so1370428wme.0 for ; Tue, 19 Jun 2018 08:44:39 -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=a382plahQ2poUqc2xxWA00puTkun/ceu60ki1dROSyQ=; b=fYpa/43G7avLdy6CnO2Q/Y39385Gcp19nYT7QEL29fkNBc7zK963p2DazGzG3dCq/s vPj5ISUphu7aMyl1KP1EDKDPWxRZnc4ihUnScKzecRvlCSjbXvp9jbSo41ZxeJWazNgA QS6IcxmYd5TnpTwnRwgZ0ifoOOvxlLKX1l/f0= 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=a382plahQ2poUqc2xxWA00puTkun/ceu60ki1dROSyQ=; b=DK/2BYnSDa+vyyOntNUEOatrn/rApPCbxhQ4rPfTPPGrKPuzBpLnpwcrtLMHXU9d8w jkvq02dUuEvQqWKDG9YT3NhYzMfUlYMCgrpLCtx3sfA/aBuH6EezKZHrFyvBbX+RMrGx VGy+M/sVhyb97O5Gm9DQVaPIUxgTs9ZbmxyxJ5BvpF7R7uYp9cyehHFx9no3MiKaeMKd o83smosBvzkE0my1IHJgqaVfY3wjvCiv+mVUtCbRak2+qm+sHFmpE8yUYeekGDQKYyuZ kqi35S8QqF3hv7MUJZzSzUGqptiKgOCdsNFkZXCO7UDpiEOFVfoP9t6BLrsQEvzbQbhV YFvQ== X-Gm-Message-State: APt69E1aOmLDK9IZymoSvvmZULG0T5CLPq1OLWYvJe4S8J7nPIUZAD7G pBzz0wFZ9/AryaTe8wEEN4AsTg== X-Received: by 2002:a1c:e594:: with SMTP id c142-v6mr12484913wmh.161.1529423078299; Tue, 19 Jun 2018 08:44:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a1-v6sm1538wrq.54.2018.06.19.08.44.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:44:36 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9E93B3E0866; Tue, 19 Jun 2018 16:44:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:41 +0100 Message-Id: <20180619154435.18898-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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:c09::241 Subject: [Qemu-devel] [PULL 02/56] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net 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 -- 2.17.1 diff --git a/configure b/configure index 089de03918..6e33dbbe10 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=""