Introduce _LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR ABI option.

EricWF · EricWF · commit 9aca97d6f932 · 2017-01-02T22:17:51.000Z
Currently libc++ compiles a special version of error_category()
into the dylib. This definition is no longer needed, and doesn't
work on Windows due to dllimport/dllexport semantics.

For those reasons this patch introduces an option to
disable/enable this definition. By default the definition
is provided in ABI v1 except on windows. This patch
also addresses D28210.

llvm-svn: 290840
diff --git a/libcxx/include/__config b/libcxx/include/__config
@@ -53,6 +53,10 @@
 // of nullptr_t. This option is ABI incompatible with GCC in C++03 mode.
 #define _LIBCPP_ABI_ALWAYS_USE_CXX11_NULLPTR
 #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
+#endif
 // Feature macros for disabling pre ABI v1 features. All of these options
 // are deprecated.
 #if defined(__FreeBSD__)
diff --git a/libcxx/include/system_error b/libcxx/include/system_error
@@ -384,7 +384,8 @@ class _LIBCPP_TYPE_VIS error_category
 public:
     virtual ~error_category() _NOEXCEPT;
 
-#ifdef _LIBCPP_BUILDING_SYSTEM_ERROR
+#if defined(_LIBCPP_BUILDING_SYSTEM_ERROR) && \
+    defined(_LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR)
     error_category() _NOEXCEPT;
 #else
     _LIBCPP_ALWAYS_INLINE
diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp
@@ -29,9 +29,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 // class error_category
 
+#if defined(_LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR)
 error_category::error_category() _NOEXCEPT
 {
 }
+#endif
 
 error_category::~error_category() _NOEXCEPT
 {

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD`
`29`	`29`
`30`	`30`	`// class error_category`
`31`	`31`
	`32`	`+#if defined(_LIBCPP_DEPRECATED_ABI_EXTERNAL_ERROR_CATEGORY_CONSTRUCTOR)`
`32`	`33`	`error_category::error_category() _NOEXCEPT`
`33`	`34`	`{`
`34`	`35`	`}`
	`36`	`+#endif`
`35`	`37`
`36`	`38`	`error_category::~error_category() _NOEXCEPT`
`37`	`39`	`{`