From: Mingli Yu <mingli...@windriver.com> When use gcc 10.1.0 and debug build is enabled, there comes below build failure: | /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 <mingli...@windriver.com> --- meta/recipes-devtools/qemu/qemu.inc | 1 + ...le.h-always-define-unknown_lock_type.patch | 48 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_5.1.0.bb | 5 -- 3 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 5599382a92..d0d4cb7add 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -30,6 +30,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-Add-enable-disable-udev.patch \ file://0001-qemu-Do-not-include-file-if-not-exists.patch \ file://find_datadir.patch \ + file://0001-lockable.h-always-define-unknown_lock_type.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch b/meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch new file mode 100644 index 0000000000..053ddd4fcc --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-lockable.h-always-define-unknown_lock_type.patch @@ -0,0 +1,48 @@ +From 8c234bb39eb293a44ca58e15303a359bb782931f Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli...@windriver.com> +Date: Wed, 9 Sep 2020 08:41:27 +0000 +Subject: [PATCH] lockable.h: always define unknown_lock_type + +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. + +Upstream-Status: Submitted [qemu-devel mailing list] + +Signed-off-by: Mingli Yu <mingli...@windriver.com> +--- + include/qemu/lockable.h | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h +index b620023141..e792ed9a69 100644 +--- a/include/qemu/lockable.h ++++ b/include/qemu/lockable.h +@@ -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) +-- +2.26.2 + diff --git a/meta/recipes-devtools/qemu/qemu_5.1.0.bb b/meta/recipes-devtools/qemu/qemu_5.1.0.bb index 9b09490269..a4018cc448 100644 --- a/meta/recipes-devtools/qemu/qemu_5.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_5.1.0.bb @@ -10,11 +10,6 @@ DEPENDS = "glib-2.0 zlib pixman bison-native" RDEPENDS_${PN}_class-target += "bash" -# Does not compile for -Og because that level does not clean up dead-code. -# See lockable.h. -# -DEBUG_BUILD = "0" - EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142349): https://lists.openembedded.org/g/openembedded-core/message/142349 Mute This Topic: https://lists.openembedded.org/mt/76748224/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
