From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH 02/43] cmake: remove dynamic-list linker option Date: Sun, 12 Apr 2020 02:13:00 +0200 [thread overview] Message-ID: <e9842db1a36e0511ae200d149516385a281da440.1586650013.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1586650013.git.v.shpilevoy@tarantool.org> dynamic-list (exported_symbols_list on Mac) was used to forbid export of all symbols of the tarantool executable except a given list. Motivation of that was to avoid hacking the linker with false usage of symbols needed to be exported. As a consequence, symbols not listed in these options became invisible. Before these options, when a symbol was defined, but not used in the final executable, the linker could throw it away, even though many symbols were used by Lua FFI, or should be visible for user's dynamic modules. Where the linker, obviously, can't see if they are needed. To make the linker believe the symbols are actually needed there was a hack with getting pointers at these functions and doing something with them. For example, assume we have 'test()' function in 'box' static library: int test(void); It is not used anywhere in the final executable. So to trick the linker there is a function 'export()' declared, which takes a pointer at 'test()' and seemingly does something with it (or actually does - it does not matter): void export() { void *syms[] = {test}; if (time(NULL) == 0) { syms[0](); syms[1](); ... } } Some users want to use not documented but visible symbols, so the patch removes the dynamic-list option, and returns the linker hack back, but in a more structured form. Part of #2971 --- .gitignore | 1 - src/CMakeLists.txt | 50 +++---------------------------------- src/exports.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ src/main.cc | 5 ++++ 4 files changed, 69 insertions(+), 48 deletions(-) create mode 100644 src/exports.c diff --git a/.gitignore b/.gitignore index cda28d79f..a42c7db35 100644 --- a/.gitignore +++ b/.gitignore @@ -57,7 +57,6 @@ extra/dist/tarantool.logrotate extra/dist/tarantool@.service extra/dist/tarantool.tmpfiles.conf extra/dist/tarantool-generator -extra/exports.* cmake_install.cmake config.mk config.guess diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a17da9901..3a8b670f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -245,56 +245,12 @@ if(BUILD_STATIC) endif() endif() -# Exports syntax is toolchain-dependent, preprocessing is necessary -set(exports_file ${CMAKE_BINARY_DIR}/extra/exports.${CMAKE_SYSTEM_NAME}) -add_custom_target(preprocess_exports - DEPENDS ${exports_file}) -add_custom_command( - OUTPUT ${exports_file} - DEPENDS ${CMAKE_SOURCE_DIR}/extra/exports - COMMAND ${CMAKE_SOURCE_DIR}/extra/mkexports - ${CMAKE_SOURCE_DIR}/extra/exports - ${exports_file} ${CMAKE_SYSTEM_NAME} - ${EXPORT_LIST} -) - add_executable( - tarantool main.cc + tarantool main.cc exports.c ${LIBUTIL_FREEBSD_SRC}/flopen.c ${LIBUTIL_FREEBSD_SRC}/pidfile.c) -add_dependencies(tarantool build_bundled_libs preprocess_exports sql) - -# Re-link if exports changed -set_target_properties(tarantool PROPERTIES LINK_DEPENDS ${exports_file}) - -# A note about linkers: -# [GNU linker] When linking an *executable* visibility is ignored, and -# either nothing is exported (default), or any non-static -# symbol is exported (-rdynamic), or explicitly listed -# symbols are exported (--dynamic-list). -# -# However, if a symbol listed lives in a static library it -# won't be automatically pulled, hence --whole-archive -# option. -# -# [Apple linker] One can provide an explicit export list; pulls symbols -# from static libraries. -# -if (TARGET_OS_DARWIN) - target_link_libraries(tarantool box ${common_libraries}) - set_target_properties(tarantool PROPERTIES - LINK_FLAGS "-Wl,-exported_symbols_list,${exports_file}") -else () - target_link_libraries(tarantool - -Wl,--whole-archive box ${reexport_libraries} - salad -Wl,--no-whole-archive - ${common_libraries} - ${generic_libraries}) - set_target_properties(tarantool PROPERTIES - LINK_FLAGS "-Wl,--dynamic-list,${exports_file}") - # get rid of -rdynamic - set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") -endif() +add_dependencies(tarantool build_bundled_libs sql) +target_link_libraries(tarantool box ${common_libraries}) install (TARGETS tarantool DESTINATION bin) diff --git a/src/exports.c b/src/exports.c new file mode 100644 index 000000000..4bb423a57 --- /dev/null +++ b/src/exports.c @@ -0,0 +1,61 @@ +/* + * Copyright 2010-2020, Tarantool AUTHORS, please see AUTHORS file. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#define EXPORT(func) extern void ** func(void) + +/** + * The file is a hack to force the linker keep the needed symbols + * in the result tarantool executable file. + * + * Problem is that if a symbol is defined but never used, the + * linker may throw it away. But many symbols are needed for Lua + * FFI and for the public C API used by dynamic modules. + * + * This file creates a 'false usage' of needed symbols. It takes + * pointers at them and does something with them, so as the + * compiler and linker couldn't remove it. + * + * Some exporters may represent modules having submodules, and may + * aggregate symbols from them. + * + * Add new exporters here. Keep them in alphabetical order. + */ + +void +export_syms(void) +{ + void *syms[] = { + }; + const int func_count = sizeof(syms) / sizeof(syms[0]); + for (int i = 0; i < func_count; ++i) + ((void **(*)(void))syms[i])(); +} + +#undef EXPORT diff --git a/src/main.cc b/src/main.cc index bb0794dfe..712c70bc0 100644 --- a/src/main.cc +++ b/src/main.cc @@ -711,6 +711,9 @@ break_loop(struct trigger *, void *) return 0; } +extern "C" void +export_syms(void); + int main(int argc, char **argv) { @@ -808,6 +811,8 @@ main(int argc, char **argv) title_set_script_name(argv[0]); } + export_syms(); + random_init(); crc32_init(); -- 2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-04-12 0:13 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-12 0:12 [Tarantool-patches] [PATCH 00/43] Unhide symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 01/43] cmake: remove double usage of some source files Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 10/43] build: export src/lib/core/fiber.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 11/43] build: export src/lua/init.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 12/43] build: export src/lib/core/port.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 13/43] build: export src/lib/csv/csv.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 14/43] build: export src/title.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 15/43] build: export src/lua/tnt_iconv.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 16/43] build: export src/lib/core/exception.cc symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 17/43] build: export src/lib/uuid/tt_uuid.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 18/43] build: export src/lib/core/say.c symbols Vladislav Shpilevoy 2020-04-12 0:12 ` [Tarantool-patches] [PATCH 19/43] build: export src/lib/uri/uri.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` Vladislav Shpilevoy [this message] 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 20/43] build: export third_party/PMurHash.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 21/43] build: export src/crc32.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 22/43] build: export src/lua/msgpack.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 23/43] build: export src/main.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 24/43] build: export src/box/space.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 25/43] build: export src/box/schema.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 26/43] build: export src/lib/crypto/crypto.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 27/43] build: export src/lua/buffer.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 28/43] build: export src/lib/swim/swim.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 29/43] build: export src/lib/core/fiber_cond.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 03/43] build: export src/lib/core/clock.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 30/43] build: export src/lib/core/coio.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 31/43] build: export src/lua/utils.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 32/43] build: export src/box/lua/tuple.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 33/43] build: export src/lua/error.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 34/43] build: export src/box/txn.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 35/43] build: export src/box/key_def.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 36/43] build: export src/box/tuple.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 37/43] build: export src/box/index.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 38/43] build: export src/box/box.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 39/43] build: export src/box/error.cc symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 04/43] build: export src/scramble.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 40/43] build: export src/lib/core/diag.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 41/43] build: export src/lib/core/latch.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 42/43] build: export src/lua/string.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 43/43] build: export public Lua symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 05/43] build: export src/lua/socket.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 06/43] build: export third_party/base64.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 07/43] build: export src/lua/digest.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 08/43] build: export src/lib/salad/guava.c symbols Vladislav Shpilevoy 2020-04-12 0:13 ` [Tarantool-patches] [PATCH 09/43] build: export src/lib/core/random.c symbols Vladislav Shpilevoy 2020-04-14 18:14 ` Timur Safin 2020-04-12 11:34 ` [Tarantool-patches] [PATCH 00/43] Unhide symbols Konstantin Osipov 2020-04-12 14:05 ` Vladislav Shpilevoy 2020-04-13 9:40 ` Konstantin Osipov 2020-04-13 9:42 ` Konstantin Osipov 2020-04-13 13:53 ` Vladislav Shpilevoy 2020-04-13 14:15 ` Konstantin Osipov 2020-04-13 14:21 ` Vladislav Shpilevoy 2020-04-13 19:49 ` Sergey Ostanevich 2020-04-13 21:01 ` Vladislav Shpilevoy 2020-04-13 21:38 ` Konstantin Osipov 2020-04-14 18:01 ` Timur Safin 2020-04-14 18:26 ` Timur Safin 2020-04-14 20:41 ` 'Konstantin Osipov' 2020-04-15 10:28 ` Mons Anderson 2020-04-15 10:40 ` Mons Anderson 2020-04-15 10:50 ` sergos 2020-04-15 21:58 ` Vladislav Shpilevoy 2020-04-16 12:13 ` Cyrill Gorcunov 2020-04-16 20:30 ` Vladislav Shpilevoy 2020-04-17 7:48 ` Timur Safin 2020-04-17 8:29 ` Cyrill Gorcunov 2020-04-15 11:27 ` Konstantin Osipov 2020-04-12 14:25 ` Vladislav Shpilevoy 2020-04-12 20:18 ` Vladislav Shpilevoy 2020-04-13 14:26 ` Vladislav Shpilevoy 2020-04-13 16:44 ` Cyrill Gorcunov 2020-04-13 17:57 ` Vladislav Shpilevoy 2020-04-13 18:17 ` Cyrill Gorcunov 2020-04-14 1:15 ` Vladislav Shpilevoy 2020-04-14 1:27 ` [Tarantool-patches] [PATCH 44/43] build: export src/box/lua/console.c symbols Vladislav Shpilevoy 2020-04-15 23:15 ` [Tarantool-patches] [PATCH 00/43] Unhide symbols Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e9842db1a36e0511ae200d149516385a281da440.1586650013.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 02/43] cmake: remove dynamic-list linker option' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox