From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 06/10] configure: unify ppc64 and ppc64le
Date: Thu, 16 Dec 2021 09:51:35 +0100 [thread overview]
Message-ID: <20211216085139.99682-7-pbonzini@redhat.com> (raw)
In-Reply-To: <20211216085139.99682-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.
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 65df8d02d9..741ff99f4f 100755
--- a/configure
+++ b/configure
@@ -660,9 +660,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"
@@ -3737,7 +3738,7 @@ if test "$linux" = "yes" ; then
i386|x86_64|x32)
linux_arch=x86
;;
- ppc|ppc64|ppc64le)
+ ppc|ppc64)
linux_arch=powerpc
;;
s390x)
@@ -3919,9 +3920,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
next prev parent reply other threads:[~2021-12-16 9:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 8:51 [PATCH 00/10] configure cleanups, mostly wrt $cpu and $targetos Paolo Bonzini
2021-12-16 8:51 ` [PATCH 01/10] configure: simplify creation of plugin symbol list Paolo Bonzini
2021-12-17 20:42 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 02/10] configure: make $targetos lowercase, use windows instead of MINGW32 Paolo Bonzini
2021-12-17 20:44 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 03/10] configure: move target detection before CPU detection Paolo Bonzini
2021-12-16 8:51 ` [PATCH 04/10] configure: do not set bsd_user/linux_user early Paolo Bonzini
2021-12-17 20:49 ` Richard Henderson
2021-12-18 10:16 ` Paolo Bonzini
2021-12-16 8:51 ` [PATCH 05/10] configure: unify two case statements on $cpu Paolo Bonzini
2021-12-17 21:37 ` Richard Henderson
2021-12-16 8:51 ` Paolo Bonzini [this message]
2021-12-16 9:06 ` [PATCH 06/10] configure: unify ppc64 and ppc64le Philippe Mathieu-Daudé
2021-12-17 21:43 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 07/10] configure: unify x86_64 and x32 Paolo Bonzini
2021-12-16 9:10 ` Philippe Mathieu-Daudé
2021-12-16 15:30 ` Paolo Bonzini
2021-12-17 21:48 ` Richard Henderson
2021-12-20 9:52 ` Philippe Mathieu-Daudé
2021-12-17 21:46 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 08/10] meson: rename "arch" variable Paolo Bonzini
2021-12-16 9:10 ` Philippe Mathieu-Daudé
2021-12-17 21:49 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 09/10] configure, meson: move ARCH to meson.build Paolo Bonzini
2021-12-17 22:02 ` Richard Henderson
2021-12-16 8:51 ` [PATCH 10/10] configure: remove unnecessary symlinks Paolo Bonzini
2021-12-17 22:03 ` 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=20211216085139.99682-7-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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).