commit c81840ce854ef688dca5a06e7b1f655c6c799754
author Eric Fiselier <eric@efcs.ca> Tue Oct 20 08:11:20 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Oct 29 18:04:27 2020 -0700
tree 4725de40b15a9aebea44fb69dff37af8008b228b
parent b5d7ccadeb36861e4c87788f86e954dd08adcc94

[libc++] Make __shared_weak_count vtable consistent across all build configurations

This patch ensures that __shared_weak_count provides a consistent vtable
regardless of if RTTI is enabled or if we are targeting a static or shared
libc++ build.

This patch is technically ABI breaking, but only for a very specific
configuration that no vendor should be shipping.

Note that _LIBCPP_BUILD_STATIC is not normally defined when building
libc++.a, but instead it must be manually provided by the user or the
__config_site.

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

GitOrigin-RevId: 229db3647491ed2b2706a9b9ce13a97e38be6fa0

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 923b3c6..3f37dbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,10 +338,6 @@
     list(APPEND LIBCXXABI_COMPILE_FLAGS -DNDEBUG)
   endif()
 endif()
-# Static library
-if (NOT LIBCXXABI_ENABLE_SHARED)
-  list(APPEND LIBCXXABI_COMPILE_FLAGS -D_LIBCPP_BUILD_STATIC)
-endif()
 
 # Threading
 if (NOT LIBCXXABI_ENABLE_THREADS)