commit fd731694925eabf8713efc74fb326b05824dd81b
author Martin Storsjö <martin@martin.st> Wed Oct 21 09:11:31 2020 +0300
committer Copybara-Service <copybara-worker@google.com> Thu Oct 29 18:04:44 2020 -0700
tree 4c273c22823a17eaada714cc7b69d4797cd78445
parent 60bef0ff5a396417e299ed680fd800864b59cb31

[libcxxabi] Define _LIBCXXABI_WEAK properly for mingw compilers

Copy over the compiler detection structure from libcxx, and set
_LIBCXXABI_WEAK like _LIBCPP_WEAK is set in libcxx.

This allows users to override operator new/delete, if using those
operators from libcxxabi instead of from libcxx.

Differential Revision: https://reviews.llvm.org/D89863

GitOrigin-RevId: 5449ea9f90ea8e0adb1f8427b82dd30ccb31d96c

include/__cxxabi_config.h

diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h
index 98f55b2..cffedb8 100644
--- a/include/__cxxabi_config.h
+++ b/include/__cxxabi_config.h
@@ -18,6 +18,19 @@
 #define __has_attribute(_attribute_) 0
 #endif
 
+#if defined(__clang__)
+#  define _LIBCXXABI_COMPILER_CLANG
+#  ifndef __apple_build_version__
+#    define _LIBCXXABI_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
+#  endif
+#elif defined(__GNUC__)
+#  define _LIBCXXABI_COMPILER_GCC
+#elif defined(_MSC_VER)
+#  define _LIBCXXABI_COMPILER_MSVC
+#elif defined(__IBMCPP__)
+#  define _LIBCXXABI_COMPILER_IBM
+#endif
+
 #if defined(_WIN32)
  #if defined(_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS)
   #define _LIBCXXABI_HIDDEN
@@ -53,7 +66,7 @@
  #endif
 #endif
 
-#if defined(_WIN32)
+#if defined(_LIBCXXABI_COMPILER_MSVC)
 #define _LIBCXXABI_WEAK
 #else
 #define _LIBCXXABI_WEAK __attribute__((__weak__))