commit a7ae303de36dfa1e0a165c52cd073c51dc85e8cb
author Eric Fiselier <eric@efcs.ca> Tue Jan 17 03:16:26 2017 +0000
committer Eric Fiselier <eric@efcs.ca> Tue Jan 17 03:16:26 2017 +0000
tree 95de3dec019969be9d02579f529953087b9a9cf7
parent 9133eadd600f539e0719a23a8848504e4809c70c

Add ABI option to remove recently inlined __shared_count functions from the library.

In order to allow inlining of previously out-of-line functions without an ABI break
libc++ provides legacy definitions in the dylib that old programs can
continue to use. Unfortunatly Windows link.exe detects this hack and diagnoses the duplicate
definitions.

This patch disable the duplicate definitions on Windows by adding an ABI option
which disables all "legacy out-of-line symbols"

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292190 91177308-0d34-0410-b5e6-96231b3b80d8

include/__config

diff --git a/include/__config b/include/__config
index 86413d5..3073a6d 100644
--- a/include/__config
+++ b/include/__config
@@ -59,8 +59,9 @@
 #define _LIBCPP_ABI_POINTER_SAFETY_ENUM_TYPE
 #elif _LIBCPP_ABI_VERSION == 1
 #if !defined(_WIN32)
-// Enable compiling a definition of error_category() into the libc++ dylib.
-#define _LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR
+// Enable compiling copies of now inline methods into the dylib to support
+// applications compiled against older libraries.
+#define _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS
 #endif
 // Feature macros for disabling pre ABI v1 features. All of these options
 // are deprecated.

include/memory

diff --git a/include/memory b/include/memory
index 505f7c8..1b58550 100644
--- a/include/memory
+++ b/include/memory
@@ -3750,7 +3750,8 @@
     explicit __shared_count(long __refs = 0) _NOEXCEPT
         : __shared_owners_(__refs) {}
 
-#ifdef _LIBCPP_BUILDING_MEMORY
+#if defined(_LIBCPP_BUILDING_MEMORY) && \
+    defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
     void __add_shared() _NOEXCEPT;
     bool __release_shared() _NOEXCEPT;
 #else
@@ -3787,7 +3788,8 @@
     virtual ~__shared_weak_count();
 
 public:
-#ifdef _LIBCPP_BUILDING_MEMORY
+#if defined(_LIBCPP_BUILDING_MEMORY) && \
+    defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
     void __add_shared() _NOEXCEPT;
     void __add_weak() _NOEXCEPT;
     void __release_shared() _NOEXCEPT;

include/system_error

diff --git a/include/system_error b/include/system_error
index 3257ef9..a29807d 100644
--- a/include/system_error
+++ b/include/system_error
@@ -385,7 +385,7 @@
     virtual ~error_category() _NOEXCEPT;
 
 #if defined(_LIBCPP_BUILDING_SYSTEM_ERROR) && \
-    defined(_LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR)
+    defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
     error_category() _NOEXCEPT;
 #else
     _LIBCPP_ALWAYS_INLINE

src/memory.cpp

diff --git a/src/memory.cpp b/src/memory.cpp
index 099f2d6..f6f6fe8 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -35,6 +35,7 @@
 {
 }
 
+#if defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
 void
 __shared_count::__add_shared() _NOEXCEPT
 {
@@ -71,6 +72,8 @@
         __release_weak();
 }
 
+#endif // _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS
+
 void
 __shared_weak_count::__release_weak() _NOEXCEPT
 {

src/system_error.cpp

diff --git a/src/system_error.cpp b/src/system_error.cpp
index c547124..9411499 100644
--- a/src/system_error.cpp
+++ b/src/system_error.cpp
@@ -29,7 +29,7 @@
 
 // class error_category
 
-#if defined(_LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR)
+#if defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
 error_category::error_category() _NOEXCEPT
 {
 }