[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/27] configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS
From: |
Paolo Bonzini |
Subject: |
[PULL 11/27] configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS |
Date: |
Wed, 3 Nov 2021 16:04:26 +0100 |
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.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 53 ++++++++++++++---------------------------------------
1 file changed, 14 insertions(+), 39 deletions(-)
diff --git a/configure b/configure
index b5c36347eb..c0018a304f 100755
--- a/configure
+++ b/configure
@@ -1263,45 +1263,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
- [PULL 00/27] Misc patches for QEMU 6.2 soft freeze, Paolo Bonzini, 2021/11/03
- [PULL 02/27] Makefile: Fix cscope issues on MacOS and soft links, Paolo Bonzini, 2021/11/03
- [PULL 05/27] util: Make some iova_tree parameters const, Paolo Bonzini, 2021/11/03
- [PULL 03/27] Partially revert "build: -no-pie is no functional linker flag", Paolo Bonzini, 2021/11/03
- [PULL 08/27] optionrom: add a DMA-enabled multiboot ROM, Paolo Bonzini, 2021/11/03
- [PULL 06/27] MAINTAINERS: update location of microvm docs, Paolo Bonzini, 2021/11/03
- [PULL 09/27] target/i386: use DMA-enabled multiboot ROM for new-enough QEMU machine types, Paolo Bonzini, 2021/11/03
- [PULL 10/27] configure: remove useless NPTL probe, Paolo Bonzini, 2021/11/03
- [PULL 11/27] configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS,
Paolo Bonzini <=
- [PULL 01/27] Makefile: Fix gtags generation, Paolo Bonzini, 2021/11/03
- [PULL 04/27] configure/optionrom: Fix MSYS2 multiboot.bin issue, Paolo Bonzini, 2021/11/03
- [PULL 07/27] target/i386: move linuxboot_dma_enabled to X86MachineState, Paolo Bonzini, 2021/11/03
- [PULL 12/27] hvf: Avoid mapping regions < PAGE_SIZE as ram, Paolo Bonzini, 2021/11/03
- [PULL 15/27] vl: deprecate -watchdog, Paolo Bonzini, 2021/11/03
- [PULL 17/27] hw/i386: fix vmmouse registration, Paolo Bonzini, 2021/11/03
- [PULL 26/27] configure: Remove the check for the __thread keyword, Paolo Bonzini, 2021/11/03
- [PULL 27/27] configure: fix --audio-drv-list help message, Paolo Bonzini, 2021/11/03
- [PULL 14/27] watchdog: add information from -watchdog help to -device help, Paolo Bonzini, 2021/11/03
- [PULL 22/27] meson.build: Allow to disable OSS again, Paolo Bonzini, 2021/11/03