lockable.h: always define unknown_lock_type
PATCH 1/1 lockable.h: always define unknown_lock_type
From: Mingli Yu <[email protected]>
There comes below build failure when use gcc 10.1.0 and "-Og" passed to compiler.
| /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:25: undefined reference to `unknown_lock_type' | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o: in function `fsdev_co_throttle_request': | /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: undefined reference to `unknown_lock_type' | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o:/mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: more undefined references to `unknown_lock_type' follow | collect2: error: ld returned 1 exit status
So always define unknown_lock_type to fix the above error.
Signed-off-by Mingli Yu <[email protected]>
--- include/qemu/lockable.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
include/qemu/lockable.h +1 -6
@@ -25,17 +25,12 @@ struct QemuLockable { };/* This function gives an error if an invalid, non-NULL pointer type is passed -* to QEMU_MAKE_LOCKABLE. For optimized builds, we can rely on dead-code elimination -* from the compiler, and give the errors already at link time. +* to QEMU_MAKE_LOCKABLE. */ -#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) -void unknown_lock_type (void *); -#else static inline void unknown_lock_type (void *unused) {abort (); } -#endif static inline __attribute__((__always_inline__))QemuLockable *qemu_make_lockable (void *x,QemuLockable *lockable)
Signature · 1 line
2.26.2
Quoted 11 lines · On 9/13/20 6:42 PM, [email protected] wrote:
From: Mingli Yu <[email protected]>
There comes below build failure when use gcc 10.1.0 and "-Og" passed to compiler.
| /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:25: undefined reference to `unknown_lock_type' | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o: in function `fsdev_co_throttle_request': | /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: undefined reference to `unknown_lock_type' | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o:/mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: more undefined references to `unknown_lock_type' follow | collect2: error: ld returned 1 exit statusSo always define
unknown_lock_typeto fix the above error.
There's a lot that won't work with -Og, including stuff that uses qemu_build_not_reached (which this itself should have been using).
r~