From patchwork Wed May 22 04:45:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 164768 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp407762ili; Tue, 21 May 2019 21:52:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxFWPkl6JfGJ/7sqwUS4Ke0rHFYhvfum9cgIuFvHwd47AJEGEF3bg08Mc0ZKumn+yomRb9p X-Received: by 2002:a17:906:cc92:: with SMTP id oq18mr42504183ejb.230.1558500757138; Tue, 21 May 2019 21:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558500757; cv=none; d=google.com; s=arc-20160816; b=lH7+axFA5OgBGm5rwvnecYI8QJajmHsT4BO1k30SGClgWPQ/RdSeLTdDkq+PQS8m9S AAKdzrt8fVkkPk/Fpv9DKoeMKhvrpx1O386Y8l8xywHSjBpGPkAvYT6x2J5QuoAi4Equ N8RRchxbXaxwhqBc0uTrIbJNewvN29UuRxxu2ahKhXljZ1mfdsLvkoljiagIp86CgegY 0HnH5kg0Hwlka0Z5YGrEz8GfIMygfm60qTEDTMIFDhUWdP4SSqZThxdtBLs1RZyshSSw 9JYylOgdGb6dktr+uyClkYANrxZKv16Un4x757JkKcNjJ+m0uuvZ0PYibYASOps6hqEj Mdiw== 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; bh=9JaW319F3WMFcPzHzwcBZuNyA8WCze8WfJBXJ+/1WcU=; b=M3Wn3FZMwx7Qp5EY2Y3UZ109VbJklNn/NpmeFiOE7RqyhbMGmLOXvVRAK5al7LCAaN auMARmEzXCQItSMeJIauPhmlV0ILhpXo764lFOtBnPZXki7gsuoQUN187j92HHawBd5E A/kQeYh8swnBx7h1/KPIMMfwIMOfVXgyDWGqpowGgHhv4k6YrkfhH4ZSoF+f9e6MRlD2 AwU4H/g8LLvYsTPdAh+2gCO6Fm14qVNQZYEdzXFG/+tNf6y66yDUmrBFxYhuBQflr/zh RFrRAqy2YwDIak7/+I3JJOERBhvqUJGb+LlcDkFOnZfsywdO8NhkDgx/jjRPyxbOhPRW nJkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=R4jEwaLi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o9si193133ejz.286.2019.05.21.21.52.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 21 May 2019 21:52:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=R4jEwaLi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:35782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJEy-00008h-3X for patch@linaro.org; Wed, 22 May 2019 00:52:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTJ8q-0003Lw-AA for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTJ8o-0006aZ-Rs for qemu-devel@nongnu.org; Wed, 22 May 2019 00:46:16 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:54331 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTJ8m-0006We-MU; Wed, 22 May 2019 00:46:14 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4580Ss54Wvz9sN6; Wed, 22 May 2019 14:46:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1558500365; bh=K39eTPMxj78aP5BGFsBiRFak42glNHpHZQs21KFAfSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4jEwaLiJF9xpI/1pE8KtHM7R1WtHoUPDo94xVefteZk5pRZ9ixg7dE41ROMncZpE JGZuP6/Ksn5L7YdmBwI6x/Qp4WNRSmi2ffSifcTj33k5x6X/hkyHFwQ5yl95QpL0yQ JnuXCNEqA2oqSkhIcjp2ny12eey9KDbeBt+TNoZ0= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 22 May 2019 14:45:24 +1000 Message-Id: <20190522044600.16534-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522044600.16534-1-david@gibson.dropbear.id.au> References: <20190522044600.16534-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 02/38] configure: Distinguish ppc64 and ppc64le hosts 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: lvivier@redhat.com, Richard Henderson , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We cannot use the ppc64le host compiler to build ppc64(be) guest code. Clean up confusion between cross_cc_powerpc and cross_cc_ppc; make use of the cflags variable as well. Signed-off-by: Richard Henderson Message-Id: <20190501223819.8584-2-richard.henderson@linaro.org> Signed-off-by: David Gibson --- configure | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) -- 2.21.0 diff --git a/configure b/configure index d2fc346302..69402f18b8 100755 --- a/configure +++ b/configure @@ -198,7 +198,7 @@ supported_kvm_target() { i386:i386 | i386:x86_64 | i386:x32 | \ x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ mips:mips | mipsel:mips | \ - ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | \ + ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | ppc64:ppc64le | \ s390x:s390x) return 0 ;; @@ -502,8 +502,11 @@ cross_cc_arm="arm-linux-gnueabihf-gcc" cross_cc_cflags_armeb="-mbig-endian" cross_cc_i386="i386-pc-linux-gnu-gcc" cross_cc_cflags_i386="" -cross_cc_powerpc="powerpc-linux-gnu-gcc" -cross_cc_powerpc="powerpc-linux-gnu-gcc" +cross_cc_ppc="powerpc-linux-gnu-gcc" +cross_cc_cflags_ppc="-m32" +cross_cc_ppc64="powerpc-linux-gnu-gcc" +cross_cc_cflags_ppc64="-m64" +cross_cc_ppc64le="powerpc64le-linux-gnu-gcc" enabled_cross_compilers="" @@ -700,7 +703,11 @@ elif check_define __sparc__ ; then fi elif check_define _ARCH_PPC ; then if check_define _ARCH_PPC64 ; then - cpu="ppc64" + if check_define _LITTLE_ENDIAN ; then + cpu="ppc64le" + else + cpu="ppc64" + fi else cpu="ppc" fi @@ -731,10 +738,14 @@ ARCH= # Note that this case should only have supported host CPUs, not guests. case "$cpu" in ppc|ppc64|s390|s390x|sparc64|x32|riscv32|riscv64) - cpu="$cpu" supported_cpu="yes" eval "cross_cc_${cpu}=\$host_cc" ;; + ppc64le) + ARCH="ppc64" + supported_cpu="yes" + cross_cc_ppc64le=$host_cc + ;; i386|i486|i586|i686|i86pc|BePC) cpu="i386" supported_cpu="yes" @@ -1538,8 +1549,8 @@ case "$cpu" in ppc) CPU_CFLAGS="-m32" LDFLAGS="-m32 $LDFLAGS" - cross_cc_powerpc=$cc - cross_cc_cflags_powerpc=$CPU_CFLAGS + cross_cc_ppc=$cc + cross_cc_cflags_ppc="$CPU_CFLAGS" ;; ppc64) CPU_CFLAGS="-m64" @@ -6164,7 +6175,7 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ fi done fi -if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" ; then +if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi @@ -7349,7 +7360,7 @@ if test "$linux" = "yes" ; then i386|x86_64|x32) linux_arch=x86 ;; - ppc|ppc64) + ppc|ppc64|ppc64le) linux_arch=powerpc ;; s390x) @@ -7510,7 +7521,8 @@ case "$target_name" in ;; ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_compiler=$cross_cc_powerpc + target_compiler=$cross_cc_ppc + target_compiler_cflags="$cross_cc_cflags_ppc" ;; ppc64) TARGET_BASE_ARCH=ppc @@ -7518,6 +7530,7 @@ case "$target_name" in mttcg=yes gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" target_compiler=$cross_cc_ppc64 + target_compiler_cflags="$cross_cc_cflags_ppc64" ;; ppc64le) TARGET_ARCH=ppc64 @@ -7533,7 +7546,8 @@ case "$target_name" in TARGET_ABI_DIR=ppc echo "TARGET_ABI32=y" >> $config_target_mak gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" - target_compiler=$cross_cc_ppc64abi32 + target_compiler=$cross_cc_ppc + target_compiler_cflags="$cross_cc_cflags_ppc" ;; riscv32) TARGET_BASE_ARCH=riscv