From d8ff892dc23e9921db49d2053036240675bb50f8 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 9 Nov 2021 09:18:20 +0100 Subject: [PATCH] configure: unify ppc64 and ppc64le MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- 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"}