CPU_CFLAGS is included in the link commands both during configure
and (via config-meson.cross) during meson. It need not be added
separately to QEMU_LDFLAGS.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 53 ++++++++++++++---------------------------------------
1 file changed, 14 insertions(+), 39 deletions(-)
diff --git a/configure b/configure
index d175fadd74..f26725e657 100755
--- a/configure
+++ b/configure
@@ -1261,45 +1261,20 @@ firmwarepath="${firmwarepath:-$datadir/qemu-firmware}"
localedir="${localedir:-$datadir/locale}"
case "$cpu" in
- ppc)
- CPU_CFLAGS="-m32"
- QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS"
- ;;
- ppc64)
- CPU_CFLAGS="-m64"
- QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS"
- ;;
- sparc)
- CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc"
- QEMU_LDFLAGS="-m32 -mv8plus $QEMU_LDFLAGS"
- ;;
- sparc64)
- CPU_CFLAGS="-m64 -mcpu=ultrasparc"
- QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS"
- ;;
- s390)
- CPU_CFLAGS="-m31"
- QEMU_LDFLAGS="-m31 $QEMU_LDFLAGS"
- ;;
- s390x)
- CPU_CFLAGS="-m64"
- QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS"
- ;;
- i386)
- CPU_CFLAGS="-m32"
- QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS"
- ;;
- x86_64)
- # ??? Only extremely old AMD cpus do not have cmpxchg16b.
- # If we truly care, we should simply detect this case at
- # runtime and generate the fallback to serial emulation.
- CPU_CFLAGS="-m64 -mcx16"
- QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS"
- ;;
- x32)
- CPU_CFLAGS="-mx32"
- QEMU_LDFLAGS="-mx32 $QEMU_LDFLAGS"
- ;;
+ ppc) CPU_CFLAGS="-m32" ;;
+ ppc64) CPU_CFLAGS="-m64" ;;
+ sparc) CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" ;;
+ sparc64) CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;;
+ s390) CPU_CFLAGS="-m31" ;;
+ s390x) CPU_CFLAGS="-m64" ;;
+ i386) CPU_CFLAGS="-m32" ;;
+ x32) CPU_CFLAGS="-mx32" ;;
+
+ # ??? Only extremely old AMD cpus do not have cmpxchg16b.
+ # If we truly care, we should simply detect this case at
+ # runtime and generate the fallback to serial emulation.
+ x86_64) CPU_CFLAGS="-m64 -mcx16" ;;
+
# No special flags required for other host CPUs
esac
--
2.31.1
On 10/25/21 10:20, Paolo Bonzini wrote: Can we prefix with this? Since commit 4dba2789084 ("configure, meson: move CPU_CFLAGS out of QEMU_CFLAGS"), > CPU_CFLAGS is included in the link commands both during configure > and (via config-meson.cross) during meson. It need not be added > separately to QEMU_LDFLAGS. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > configure | 53 ++++++++++++++--------------------------------------- > 1 file changed, 14 insertions(+), 39 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 25/10/21 12:52, Philippe Mathieu-Daudé wrote: > On 10/25/21 10:20, Paolo Bonzini wrote: > > Can we prefix with this? > > Since commit 4dba2789084 ("configure, meson: move CPU_CFLAGS > out of QEMU_CFLAGS"), Good point, done. Paolo
© 2016 - 2024 Red Hat, Inc.