qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 04/16] configure: unify ppc64 and ppc64le
Date: Sun, 19 Dec 2021 15:16:59 +0100	[thread overview]
Message-ID: <20211219141711.248066-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com>

The only difference between the two, as far as either configure or
Meson are concerned, is the default endianness of the compiler.

For tests/tcg, specify the endianness explicitly on the command line;
for configure, do the same so that it is possible to have --cpu=ppc64le
on a bigendian system or vice versa.  Apart from this, cpu=ppc64le can
be normalized to ppc64 also in configure and not just in the meson
cross file.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure              | 10 ++++------
 tests/tcg/configure.sh |  4 +++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 77ccc15b73..85caf2e9ef 100755
--- a/configure
+++ b/configure
@@ -661,9 +661,10 @@ case "$cpu" in
   ppc)
     CPU_CFLAGS="-m32" ;;
   ppc64)
-    CPU_CFLAGS="-m64" ;;
+    CPU_CFLAGS="-m64 -mbig" ;;
   ppc64le)
-    ARCH="ppc64" ;;
+    cpu="ppc64"
+    CPU_CFLAGS="-m64 -mlittle" ;;
 
   s390)
     CPU_CFLAGS="-m31"
@@ -3721,7 +3722,7 @@ if test "$linux" = "yes" ; then
   i386|x86_64|x32)
     linux_arch=x86
     ;;
-  ppc|ppc64|ppc64le)
+  ppc|ppc64)
     linux_arch=powerpc
     ;;
   s390x)
@@ -3903,9 +3904,6 @@ if test "$skip_meson" = no; then
         x86_64|x32)
             echo "cpu_family = 'x86_64'" >> $cross
             ;;
-        ppc64le)
-            echo "cpu_family = 'ppc64'" >> $cross
-            ;;
         *)
             echo "cpu_family = '$ARCH'" >> $cross
             ;;
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 9b76f58258..9ef913df5b 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -64,7 +64,9 @@ fi
 : ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
 : ${cross_cc_cflags_ppc="-m32"}
 : ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
-: ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"}
+: ${cross_cc_cflags_ppc64="-m64 -mbig"}
+: ${cross_cc_ppc64le="$cross_cc_ppc64"}
+: ${cross_cc_cflags_ppc64le="-m64 -mlittle"}
 : ${cross_cc_riscv64="riscv64-linux-gnu-gcc"}
 : ${cross_cc_s390x="s390x-linux-gnu-gcc"}
 : ${cross_cc_sh4="sh4-linux-gnu-gcc"}
-- 
2.33.1




  parent reply	other threads:[~2021-12-19 14:22 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-19 14:16 [PULL 00/16] Misc patches for 2021-12-20 Paolo Bonzini
2021-12-19 14:16 ` [PULL 01/16] configure: make $targetos lowercase, use windows instead of MINGW32 Paolo Bonzini
2021-12-19 14:16 ` [PULL 02/16] configure: move target detection before CPU detection Paolo Bonzini
2021-12-19 14:16 ` [PULL 03/16] configure: unify two case statements on $cpu Paolo Bonzini
2021-12-19 14:16 ` Paolo Bonzini [this message]
2021-12-19 14:17 ` [PULL 05/16] configure: unify x86_64 and x32 Paolo Bonzini
2021-12-19 14:17 ` [PULL 06/16] meson: rename "arch" variable Paolo Bonzini
2021-12-19 14:17 ` [PULL 07/16] configure, meson: move ARCH to meson.build Paolo Bonzini
2021-12-21  2:46   ` Richard Henderson
2022-07-19 13:00   ` Peter Maydell
2022-07-19 18:10     ` Paolo Bonzini
2022-07-20  0:51       ` Richard Henderson
2021-12-19 14:17 ` [PULL 08/16] configure: remove unnecessary symlinks Paolo Bonzini
2021-12-19 14:17 ` [PULL 09/16] configure: remove DIRS Paolo Bonzini
2022-01-07 11:02   ` Thomas Huth
2021-12-19 14:17 ` [PULL 10/16] meson: reenable test-fdmon-epoll Paolo Bonzini
2021-12-19 14:17 ` [PULL 11/16] cpu: remove unnecessary #ifdef CONFIG_TCG Paolo Bonzini
2021-12-19 14:20 ` [PULL 12/16] meson: add "check" argument to run_command Paolo Bonzini
2021-12-19 14:20 ` [PULL 13/16] hw/scsi: Fix scsi_bus_init_named() docstring Paolo Bonzini
2021-12-19 14:20 ` [PULL 14/16] hw/scsi/megasas: Fails command if SGL buffer overflows Paolo Bonzini
2021-12-19 14:20 ` [PULL 15/16] tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521 Paolo Bonzini
2021-12-19 14:20 ` [PULL 16/16] hw/i386/vmmouse: Require 'i8042' property to be set Paolo Bonzini
2021-12-20  4:47 ` [PULL 00/16] Misc patches for 2021-12-20 Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211219141711.248066-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).