bsd-user: Move PRAGMA_DISABLE_PACKED_WARNING etc to qemu.h
PATCH v3 1/1 bsd-user: Move PRAGMA_DISABLE_PACKED_WARNING etc to qemu.h
For the moment, move PRAGMA_DISABLE_PACKED_WARNING and PRAGMA_ENABLE_PACKED_WARNING back to bsd-user/qemu.h.
Of course, these should be in compiler.h, but that interferes with too many things at the moment, so take one step back to unbreak clang linux-user builds first. Use the exact same version that's in linux-user/qemu.h since that's what should be in compiler.h.
--- bsd-user/qemu.h | 27 +++++++++++++++++++++++++++ include/qemu/compiler.h | 30 ------------------------------ 2 files changed, 27 insertions(+), 30 deletions(-)
bsd-user/qemu.h +27 -0
@@ -273,6 +273,33 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)* These are usually used to access struct data members once the struct has been * locked - usually with lock_user_struct(). */ + +/* +* Tricky points: +* - Use __builtin_choose_expr to avoid type promotion from ?:, +* - Invalid sizes result in a compile time error stemming from +* the fact that abort has no parameters. +* - It's easier to use the endian-specific unaligned load/store +* functions than host-endian unaligned load/store plus tswapN. +* - The pragmas are necessary only to silence a clang false-positive +* warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 . +* - gcc has bugs in its _Pragma() support in some versions, eg +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only +* include the warning-suppression pragmas for clang +*/ +#if defined(__clang__) && __has_warning("-Waddress-of-packed-member") +#define PRAGMA_DISABLE_PACKED_WARNING \ + _Pragma("GCC diagnostic push"); \ + _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") + +#define PRAGMA_REENABLE_PACKED_WARNING \ + _Pragma("GCC diagnostic pop") + +#else +#define PRAGMA_DISABLE_PACKED_WARNING +#define PRAGMA_REENABLE_PACKED_WARNING +#endif +#define __put_user_e (x, hptr, e) \ do { \ PRAGMA_DISABLE_PACKED_WARNING; \
include/qemu/compiler.h +0 -30
@@ -22,36 +22,6 @@#define QEMU_EXTERN_C extern#endif -/* -* Tricky points: -* - Use __builtin_choose_expr to avoid type promotion from ?:, -* - Invalid sizes result in a compile time error stemming from -* the fact that abort has no parameters. -* - It's easier to use the endian-specific unaligned load/store -* functions than host-endian unaligned load/store plus tswapN. -* - The pragmas are necessary only to silence a clang false-positive -* warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 . -* - We have to disable -Wpragmas warnings to avoid a complaint about -* an unknown warning type from older compilers that don't know about -* -Waddress-of-packed-member. -* - gcc has bugs in its _Pragma() support in some versions, eg -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only -* include the warning-suppression pragmas for clang -*/ -#ifdef __clang__ -#define PRAGMA_DISABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wpragmas\""); \ - _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") - -#define PRAGMA_REENABLE_PACKED_WARNING \ - _Pragma("GCC diagnostic pop") - -#else -#define PRAGMA_DISABLE_PACKED_WARNING -#define PRAGMA_REENABLE_PACKED_WARNING -#endif -#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))# define QEMU_PACKED __attribute__((gcc_struct, packed))#else
Signature · 1 line
2.41.0
Quoted 4 lines · Warner Losh
For the moment, move
PRAGMA_DISABLE_PACKED_WARNINGandPRAGMA_ENABLE_PACKED_WARNINGback tobsd-user/qemu.h.
Quoted 8 lines
Of course, these should be in
compiler.h, but that interferes with too many things at the moment, so take one step back to unbreak clang linux-user builds first. Use the exact same version that's inlinux-user/qemu.hsince that's what should be incompiler.h.--- bsd-user/qemu.h | 27 +++++++++++++++++++++++++++ include/qemu/compiler.h | 30 ------------------------------ 2 files changed, 27 insertions(+), 30 deletions(-)
Yeah, let's un-break CI first and then think about a neater thing afterwards.
thanks
-- PMM
Quoted 14 lines · Peter Maydell
Quoted 4 lines · Warner Losh
For the moment, move
PRAGMA_DISABLE_PACKED_WARNINGandPRAGMA_ENABLE_PACKED_WARNINGback tobsd-user/qemu.h.Quoted 8 lines
Of course, these should be in
compiler.h, but that interferes with too many things at the moment, so take one step back to unbreak clang linux-user builds first. Use the exact same version that's inlinux-user/qemu.hsince that's what should be incompiler.h.--- bsd-user/qemu.h | 27 +++++++++++++++++++++++++++ include/qemu/compiler.h | 30 ------------------------------ 2 files changed, 27 insertions(+), 30 deletions(-)
Quoted 3 lines
Yeah, let's un-break CI first and then think about a neater thing afterwards.
Yea. And in 2 days I'll have minutes again and in 7 I'll be past a deadline at $WORK and have time to setup local gitlab CI... but trying to play whack-a-mole
with this w/o either is going to take days...
Quoted 5 lines
Reviewed-by Peter Maydell <[email protected]>thanks
-- PMM