From d9dd85fec3d76aeb8e4ffa04ae0a67750efb2ee6 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Sun, 6 Dec 2020 12:26:13 -0300 Subject: [PATCH] eio: Add weak symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Add definition for EAPI_WEAK because this macro will be needed when we change how Eolian generates import/export symbols for the Eio library. = The Rationale = This patch is from a series of patches to rename EAPI symbols to specific library DSOs. EAPI was designed to be able to pass `__attribute__ ((visibility ("default")))` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as `__atttribute__((visibility("default")))`. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why LIBAPI is the only solution that works for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette Co-authored-by: Lucas Cavalcante de Sousa Co-authored-by: Ricardo Campos Reviewers: jptiz, lucas, vtorri, woohyun Reviewed By: vtorri Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12201 --- src/lib/eio/Eio.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h index fb0fc64813..f72529e6e0 100644 --- a/src/lib/eio/Eio.h +++ b/src/lib/eio/Eio.h @@ -36,6 +36,10 @@ # undef EAPI #endif +#ifdef EAPI_WEAK +# undef EAPI_WEAK +#endif + #ifdef _WIN32 # ifdef EFL_BUILD # ifdef DLL_EXPORT @@ -46,15 +50,19 @@ # else # define EAPI __declspec(dllimport) # endif +# define EAPI_WEAK #else # ifdef __GNUC__ # if __GNUC__ >= 4 # define EAPI __attribute__ ((visibility("default"))) +# define EAPI_WEAK __attribute__ ((weak)) # else # define EAPI +# define EAPI_WEAK # endif # else # define EAPI +# define EAPI_WEAK # endif #endif