[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/22] plugins: do not limit exported symbols if modules are activ
From: |
Alex Bennée |
Subject: |
[PULL 05/22] plugins: do not limit exported symbols if modules are active |
Date: |
Fri, 3 Sep 2021 10:03:22 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
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
diff --git a/configure b/configure
index 9a79a004d7..7659870810 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 e77723010e..bfd5c9822a 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(
--
2.30.2
- [PULL 00/22] testing and plugin updates, Alex Bennée, 2021/09/03
- [PULL 03/22] gitlab-ci: Remove superfluous "dnf install" statement, Alex Bennée, 2021/09/03
- [PULL 01/22] plugins/execlog: removed unintended "s" at the end of log lines., Alex Bennée, 2021/09/03
- [PULL 02/22] gitlab-ci: Merge "build-disabled" with "build-without-default-features", Alex Bennée, 2021/09/03
- [PULL 11/22] plugins/hotpages: introduce sortby arg and parsed bool args correctly, Alex Bennée, 2021/09/03
- [PULL 04/22] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them, Alex Bennée, 2021/09/03
- [PULL 09/22] plugins: allow plugin arguments to be passed directly, Alex Bennée, 2021/09/03
- [PULL 07/22] plugins: sort exported symbol list, Alex Bennée, 2021/09/03
- [PULL 05/22] plugins: do not limit exported symbols if modules are active,
Alex Bennée <=
- [PULL 08/22] docs/devel/tcg-plugins: added cores arg to cache plugin, Alex Bennée, 2021/09/03
- [PULL 06/22] plugins/cache: supported multicore cache modelling, Alex Bennée, 2021/09/03
- [PULL 15/22] plugins/howvec: adapting to the new argument passing scheme, Alex Bennée, 2021/09/03
- [PULL 12/22] plugins/hotblocks: Added correct boolean argument parsing, Alex Bennée, 2021/09/03
- [PULL 19/22] tests/plugins/mem: introduce "track" arg and make args not positional, Alex Bennée, 2021/09/03
- [PULL 17/22] tests/plugins/bb: adapt to the new arg passing scheme, Alex Bennée, 2021/09/03
- [PULL 20/22] tests/plugins/syscalls: adhere to new arg-passing scheme, Alex Bennée, 2021/09/03
- [PULL 22/22] docs/devel: be consistent about example plugin names, Alex Bennée, 2021/09/03
- [PULL 10/22] plugins/api: added a boolean parsing plugin api, Alex Bennée, 2021/09/03
- [PULL 14/22] plugins/hwprofile: adapt to the new plugin arguments scheme, Alex Bennée, 2021/09/03