[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] configure: simplify creation of plugin symbol list
From: |
Paolo Bonzini |
Subject: |
[PATCH 01/10] configure: simplify creation of plugin symbol list |
Date: |
Thu, 16 Dec 2021 09:51:30 +0100 |
--dynamic-list is present on all supported ELF (not Windows or Darwin)
platforms, since it dates back to 2006; -exported_symbols_list is
likewise present on all supported versions of macOS. Do not bother
doing a functional test in configure.
Since stuff is being moved to meson, move the creation of the
Darwin-formatted symbols list there, reducing the transform to a single
sed command. This also requires using -Xlinker instead of -Wl, in order
to support weird paths that include a comma.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 16 ----------------
plugins/meson.build | 13 +++++++++----
2 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index d3aac031a5..ba7ab435a6 100755
--- a/configure
+++ b/configure
@@ -3689,22 +3689,6 @@ fi
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
- # Copy the export object list to the build dir
- if test "$ld_dynamic_list" = "yes" ; then
- echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak
- ld_symbols=qemu-plugins-ld.symbols
- cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols
- elif test "$ld_exported_symbols_list" = "yes" ; then
- echo "CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST=yes" >> $config_host_mak
- ld64_symbols=qemu-plugins-ld64.symbols
- echo "# Automatically generated by configure - do not modify" >
$ld64_symbols
- grep 'qemu_' "$source_path/plugins/qemu-plugins.symbols" | sed 's/;//g'
| \
- sed -E 's/^[[:space:]]*(.*)/_\1/' >> $ld64_symbols
- else
- error_exit \
- "If \$plugins=yes, either \$ld_dynamic_list or " \
- "\$ld_exported_symbols_list should have been set to 'yes'."
- fi
fi
if test -n "$gdb_bin"; then
diff --git a/plugins/meson.build b/plugins/meson.build
index b3de57853b..eec10283c5 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,10 +1,15 @@
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=qemu-plugins-ld.symbols']
- elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host
- plugin_ldflags = ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symbols']
+ if targetos == 'darwin'
+ qemu_plugins_symbols_list = configure_file(
+ input: files('qemu-plugins.symbols'),
+ output: 'qemu-plugins-ld64.symbols',
+ capture: true,
+ command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p',
'@INPUT@'])
+ plugin_ldflags = ['-Xlinker', '-exported_symbols_list', '-Xlinker',
qemu_plugins_symbols_list]
+ else
+ plugin_ldflags = ['-Xlinker', '--dynamic-list=' +
(meson.project_source_root() / 'plugins/qemu-plugins.symbols')]
endif
endif
--
2.33.1
- [PATCH 00/10] configure cleanups, mostly wrt $cpu and $targetos, Paolo Bonzini, 2021/12/16
- [PATCH 02/10] configure: make $targetos lowercase, use windows instead of MINGW32, Paolo Bonzini, 2021/12/16
- [PATCH 01/10] configure: simplify creation of plugin symbol list,
Paolo Bonzini <=
- [PATCH 03/10] configure: move target detection before CPU detection, Paolo Bonzini, 2021/12/16
- [PATCH 06/10] configure: unify ppc64 and ppc64le, Paolo Bonzini, 2021/12/16
- [PATCH 10/10] configure: remove unnecessary symlinks, Paolo Bonzini, 2021/12/16
- [PATCH 04/10] configure: do not set bsd_user/linux_user early, Paolo Bonzini, 2021/12/16