mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS

Browse Source 
Since commit 4dba278908 ("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.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-10-15 16:29:47 +02:00
parent 605a927198
commit ff66ee5369
1 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
configure vendored
View File

@ -1263,45 +1263,20 @@ firmwarepath="${firmwarepath:-$datadir/qemu-firmware}"
localedir="${localedir:-$datadir/locale}" localedir="${localedir:-$datadir/locale}"
case "$cpu" in case "$cpu" in
ppc) ppc) CPU_CFLAGS="-m32" ;;
CPU_CFLAGS="-m32" ppc64) CPU_CFLAGS="-m64" ;;
QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS" sparc) CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" ;;
;; sparc64) CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;;
ppc64) s390) CPU_CFLAGS="-m31" ;;
CPU_CFLAGS="-m64" s390x) CPU_CFLAGS="-m64" ;;
QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS" i386) CPU_CFLAGS="-m32" ;;
;; x32) CPU_CFLAGS="-mx32" ;;
sparc)
CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" # ??? Only extremely old AMD cpus do not have cmpxchg16b.
QEMU_LDFLAGS="-m32 -mv8plus $QEMU_LDFLAGS" # If we truly care, we should simply detect this case at
;; # runtime and generate the fallback to serial emulation.
sparc64) x86_64) CPU_CFLAGS="-m64 -mcx16" ;;
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"
;;
# No special flags required for other host CPUs # No special flags required for other host CPUs
esac esac