This is an archive of the discontinued LLVM Phabricator instance.

Differential D148441

[libcxxabi] Omit dllimport in public headers in MinGW mode
ClosedPublic

Authored by mstorsjo on Apr 15 2023, 3:03 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG692518d04b2d: [libcxxabi] Omit dllimport in public headers in MinGW mode
Summary

This matches the corresponding change to libcxx headers in
dfa88927ae1411ccc3b248b7e624f2acf623d947.

This avoids needing to define _LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS
when building libcxxabi tests, for two reasons:

  • It defaults to normal linkage (as opposed to dllimport), fixing linking of a static library version of libcxx/libcxxabi
  • It avoids issues with using dllimport declarations on symbols when including cxxabi implementations into the testcase itself

This allows simplifying D147638.

Diff Detail

Event Timeline

mstorsjo created this revision.Apr 15 2023, 3:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2023, 3:03 PM
mstorsjo requested review of this revision.Apr 15 2023, 3:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2023, 3:03 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B225876: Diff 513941.Apr 17 2023, 8:57 AM
ldionne accepted this revision.Apr 18 2023, 6:13 AM
ldionne added a subscriber: ldionne.

Not a huge fan, but at least it makes libc++ and libc++abi consistent wrt how they handle that.

This revision is now accepted and ready to land.Apr 18 2023, 6:13 AM
mstorsjo mentioned this in D147638: [libcxxabi] [test] Fix the mingw test config.Apr 18 2023, 7:48 AM
This revision was landed with ongoing or failed builds.Apr 19 2023, 3:37 AM
Closed by commit rG692518d04b2d: [libcxxabi] Omit dllimport in public headers in MinGW mode (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG692518d04b2d: [libcxxabi] Omit dllimport in public headers in MinGW mode.

Revision Contents

PathSize
libcxxabi/
include/
2 lines

Diff 514892

libcxxabi/include/__cxxabi_config.h

Show All 26 Lines
# define _LIBCXXABI_COMPILER_GCC # define _LIBCXXABI_COMPILER_GCC
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define _LIBCXXABI_COMPILER_MSVC # define _LIBCXXABI_COMPILER_MSVC
#elif defined(__IBMCPP__) #elif defined(__IBMCPP__)
# define _LIBCXXABI_COMPILER_IBM # define _LIBCXXABI_COMPILER_IBM
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#if defined(_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS) #if defined(_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS) || (defined(__MINGW32__) && !defined(_LIBCXXABI_BUILDING_LIBRARY))
#define _LIBCXXABI_HIDDEN #define _LIBCXXABI_HIDDEN
#define _LIBCXXABI_DATA_VIS #define _LIBCXXABI_DATA_VIS
#define _LIBCXXABI_FUNC_VIS #define _LIBCXXABI_FUNC_VIS
#define _LIBCXXABI_TYPE_VIS #define _LIBCXXABI_TYPE_VIS
#elif defined(_LIBCXXABI_BUILDING_LIBRARY) #elif defined(_LIBCXXABI_BUILDING_LIBRARY)
#define _LIBCXXABI_HIDDEN #define _LIBCXXABI_HIDDEN
#define _LIBCXXABI_DATA_VIS __declspec(dllexport) #define _LIBCXXABI_DATA_VIS __declspec(dllexport)
#define _LIBCXXABI_FUNC_VIS __declspec(dllexport) #define _LIBCXXABI_FUNC_VIS __declspec(dllexport)
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines