00b6d2ec43
- Replace patch to fix hardcoded binfmt handler (bsc#1186256) * Patches dropped: qemu-binfmt-conf.sh-allow-overriding-SUS.patch * Patches added: qemu-binfmt-conf.sh-should-use-F-as-shor.patch - Stable fixes from upstream * Patches added: 9pfs-fix-crash-in-v9fs_walk.patch i386-cpu-Remove-AVX_VNNI-feature-from-Co.patch plugins-do-not-limit-exported-symbols-if.patch plugins-execlog-removed-unintended-s-at-.patch qemu-sockets-fix-unix-socket-path-copy-a.patch target-i386-add-missing-bits-to-CR4_RESE.patch virtio-balloon-don-t-start-free-page-hin.patch OBS-URL: https://build.opensuse.org/request/show/919019 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=672
72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Wed, 11 Aug 2021 12:05:50 +0200
|
|
Subject: plugins: do not limit exported symbols if modules are active
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: b906acace2d4f68b6ff8de73739a773cc4851436
|
|
|
|
On Mac --enable-modules and --enable-plugins are currently incompatible, because the
|
|
Apple -Wl,-exported_symbols_list command line options prevents the export of any
|
|
symbols needed by the modules. On x86 -Wl,--dynamic-list does not have this effect,
|
|
but only because the -Wl,--export-dynamic option provided by gmodule-2.0.pc overrides
|
|
it. On Apple there is no -Wl,--export-dynamic, because it is the default, and thus
|
|
no override.
|
|
|
|
Either way, when modules are active there is no reason to include the plugin_ldflags.
|
|
While at it, avoid the useless -Wl,--export-dynamic when --enable-plugins is
|
|
specified but --enable-modules is not; this way, the GNU and Apple configurations
|
|
are more similar.
|
|
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/516
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
[AJB: fix noexport to no-export]
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
|
Message-Id: <20210811100550.54714-1-pbonzini@redhat.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
configure | 5 ++---
|
|
plugins/meson.build | 14 ++++++++------
|
|
2 files changed, 10 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 26368a637f85c0667fa627f7cbd6..8b90f02927f3ea161be9af7a0e3f 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3187,9 +3187,8 @@ glib_req_ver=2.56
|
|
glib_modules=gthread-2.0
|
|
if test "$modules" = yes; then
|
|
glib_modules="$glib_modules gmodule-export-2.0"
|
|
-fi
|
|
-if test "$plugins" = "yes"; then
|
|
- glib_modules="$glib_modules gmodule-2.0"
|
|
+elif test "$plugins" = "yes"; then
|
|
+ glib_modules="$glib_modules gmodule-no-export-2.0"
|
|
fi
|
|
|
|
for i in $glib_modules; do
|
|
diff --git a/plugins/meson.build b/plugins/meson.build
|
|
index e77723010e6ebbed7b4cdaca6207..bfd5c9822a68d001a0a333a130d8 100644
|
|
--- a/plugins/meson.build
|
|
+++ b/plugins/meson.build
|
|
@@ -1,9 +1,11 @@
|
|
-if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host
|
|
- plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.build_root() / 'qemu-plugins-ld.symbols')]
|
|
-elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host
|
|
- plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.build_root() / 'qemu-plugins-ld64.symbols')]
|
|
-else
|
|
- plugin_ldflags = []
|
|
+plugin_ldflags = []
|
|
+# Modules need more symbols than just those in plugins/qemu-plugins.symbols
|
|
+if not enable_modules
|
|
+ if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host
|
|
+ plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.build_root() / 'qemu-plugins-ld.symbols')]
|
|
+ elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host
|
|
+ plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.build_root() / 'qemu-plugins-ld64.symbols')]
|
|
+ endif
|
|
endif
|
|
|
|
specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files(
|