Allow building qemu tools on 32-bit hosts
Subsystems (2)
PATCH v2 1/1 Allow building qemu tools on 32-bit hosts
From: Helge Deller <[email protected]>
Qemu's tools like qemu-img are often needed on 32-bit platforms, although the actual qemu emulators have been discontinued on 32-bit.
To allow building the tools on 32-bit this patch implements three small changes:
a) The check in meson.build is changed to still error out if the user tries to build qemu-system or qemu-user on a 32-bit platform, but allows building tools (e.g. by "--enable-tools") alone.
b) The compile time check in atomic.h now checks against sizeof(uint64_t) so that 32-bit environments can still build successfully, while 128-bit atomic operations are prevented to sneak in.
c) Allow linking against libatomic as long as we don't build the qemu-system and qemu-user binaries.
Sucessfully tested on the 32-bit big-endian powerpc architecture.
v2:
- keep comple time checks in atomic.h
- allow linking against libatomic when building tools
--- include/qemu/atomic.h | 6 +++--- meson.build | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-)
include/qemu/atomic.h +3 -3
@@ -58,11 +58,11 @@/* * Sanity check that the size of an atomic operation isn't "overly large". -* Despite the fact that e.g. i686 has 64-bit atomic operations, we do not +* Despite the fact that e.g. x86-64 has 128-bit atomic operations, we do not * want to use them because we ought not need them, and this lets us do a -* bit of sanity checking that other 32-bit hosts might build. +* bit of sanity checking that other 32- and 64-bit hosts might build. */ -#define ATOMIC_REG_SIZE sizeof(void *) +#define ATOMIC_REG_SIZE sizeof(uint64_t)/* Weak atomic operations prevent the compiler moving other * loads/stores past the atomic operation load/store. However there is
meson.build +12 -4
@@ -323,8 +323,8 @@ endif # Compiler flags # ################## -if cc.sizeof('void *') < 8 - error('QEMU requires a 64-bit CPU host architecture') +if (cc.sizeof('void *') < 8) and (have_system or have_user) + error('QEMU emulator requires a 64-bit CPU host architecture. Only tools may be built for 32-bit.') endif foreach lang : all_languages
@@ -423,8 +423,16 @@ endif # # Later checks assume we won't get atomic ops for int128 without # explicitly asking for -latomic, so we must disable GCC's new -# automatic linking with the new -fno-link-libatomic flag -qemu_isa_flags += cc.get_supported_arguments('-fno-link-libatomic') +# automatic linking with the new -fno-link-libatomic flag. +# +# When not building the emulators, but qemu helper tools only +# (e.g. on 32-bit hosts), libatomic is sometimes required and +# thus acceptable. +if (have_system or have_user) + qemu_isa_flags += cc.get_supported_arguments('-fno-link-libatomic') +else + qemu_ldflags += cc.get_supported_link_arguments('-Wl,-latomic') +endif qemu_common_flags = qemu_isa_flags + qemu_common_flags
Signature · 1 line
2.53.0
Quoted 12 lines · Helge Deller
From: Helge Deller <[email protected]>
Qemu's tools like qemu-img are often needed on 32-bit platforms, although the actual qemu emulators have been discontinued on 32-bit.
To allow building the tools on 32-bit this patch implements three small changes:
a) The check in meson.build is changed to still error out if the user tries to build qemu-system or qemu-user on a 32-bit platform, but allows building tools (e.g. by "--enable-tools") alone.
Quoted 8 lines
b) The compile time check in
atomic.hnow checks againstsizeof(uint64_t)so that 32-bit environments can still build successfully, while 128-bit atomic operations are prevented to sneak in.c) Allow linking against libatomic as long as we don't build the qemu-system and qemu-user binaries.
Sucessfully tested on the 32-bit big-endian powerpc architecture.
On powerpc, util/meson.build tweak is also needed, - did you use it?
Quoted 6 lines
v2:
- keep comple time checks inatomic.h
- allow linking against libatomic when building toolsSigned-off-by Helge Deller <[email protected]>Siggested-by Richard Henderson <[email protected]>
^^^ Suggested
Yes this makes sense too, and it looks like a good long-term solution.
Thank you again!
/mjt
Quoted 17 lines · Michael Tokarev
Quoted 16 lines · Helge Deller
From: Helge Deller <[email protected]>
Qemu's tools like qemu-img are often needed on 32-bit platforms, although the actual qemu emulators have been discontinued on 32-bit.
To allow building the tools on 32-bit this patch implements three small changes:
a) The check in meson.build is changed to still error out if the user tries to build qemu-system or qemu-user on a 32-bit platform, but allows building tools (e.g. by "--enable-tools") alone.
b) The compile time check in
atomic.hnow checks againstsizeof(uint64_t)so that 32-bit environments can still build successfully, while 128-bit atomic operations are prevented to sneak in.
Quoted 6 lines
Quoted 4 lines
c) Allow linking against libatomic as long as we don't build the qemu-system and qemu-user binaries.
Sucessfully tested on the 32-bit big-endian powerpc architecture.
On powerpc, util/meson.build tweak is also needed, - did you use it?
Yes, it was needed.
I used all your patches you sent in the series, but replaced my patch with the new v2 version.
Helge
Quoted 1 line · Helge Deller
+
qemu_ldflags+=cc.get_supported_link_arguments('-Wl,-latomic')
You don't need "-Wl".
Otherwise,
r~