diff --git a/include/__config b/include/__config index 4a8fef83b..5b3c6947c 100644 --- a/include/__config +++ b/include/__config @@ -908,15 +908,6 @@ extern "C" void __sanitizer_annotate_contiguous_container( #define _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF #endif -extern "C++" { -_LIBCPP_BEGIN_NAMESPACE_STD -_LIBCPP_FUNC_VIS _LIBCPP_WEAK int __libcpp_library_version(); -_LIBCPP_END_NAMESPACE_STD -} - -#define _LIBCPP_LIBRARY_VERSION \ - (_VSTD::__libcpp_library_version ? _VSTD::__libcpp_library_version() : -1) - #endif // __cplusplus #endif // _LIBCPP_CONFIG diff --git a/lib/abi/CHANGELOG.TXT b/lib/abi/CHANGELOG.TXT index 729a6a654..e71f09273 100644 --- a/lib/abi/CHANGELOG.TXT +++ b/lib/abi/CHANGELOG.TXT @@ -16,11 +16,6 @@ New entries should be added directly below the "Version" header. Version 4.0 ----------- -* r285382 - Add __libcpp_library_version - - all platforms - ------------- - Symbol added: _ZNSt3__124__libcpp_library_versionEv * r285101 - Add -fvisibility-inlines-hidden when building libc++. diff --git a/lib/abi/x86_64-apple-darwin16.0.abilist b/lib/abi/x86_64-apple-darwin16.0.abilist index cd26311b1..d334aed16 100644 --- a/lib/abi/x86_64-apple-darwin16.0.abilist +++ b/lib/abi/x86_64-apple-darwin16.0.abilist @@ -1213,7 +1213,6 @@ {'type': 'FUNC', 'name': '__ZNSt3__121recursive_timed_mutexD1Ev'} {'type': 'FUNC', 'name': '__ZNSt3__121recursive_timed_mutexD2Ev'} {'type': 'FUNC', 'name': '__ZNSt3__121undeclare_no_pointersEPcm'} -{'type': 'FUNC', 'name': '__ZNSt3__124__libcpp_library_versionEv'} {'type': 'FUNC', 'name': '__ZNSt3__125notify_all_at_thread_exitERNS_18condition_variableENS_11unique_lockINS_5mutexEEE'} {'type': 'FUNC', 'name': '__ZNSt3__127__insertion_sort_incompleteIRNS_6__lessIaaEEPaEEbT0_S5_T_'} {'type': 'FUNC', 'name': '__ZNSt3__127__insertion_sort_incompleteIRNS_6__lessIccEEPcEEbT0_S5_T_'} diff --git a/lib/abi/x86_64-linux-gnu.abilist b/lib/abi/x86_64-linux-gnu.abilist index fd03c6841..b6e7ce4c0 100644 --- a/lib/abi/x86_64-linux-gnu.abilist +++ b/lib/abi/x86_64-linux-gnu.abilist @@ -1141,7 +1141,6 @@ {'type': 'FUNC', 'name': '_ZNSt3__121recursive_timed_mutexD1Ev'} {'type': 'FUNC', 'name': '_ZNSt3__121recursive_timed_mutexD2Ev'} {'type': 'FUNC', 'name': '_ZNSt3__121undeclare_no_pointersEPcm'} -{'type': 'FUNC', 'name': '_ZNSt3__124__libcpp_library_versionEv'} {'type': 'FUNC', 'name': '_ZNSt3__125__num_get_signed_integralIlEET_PKcS3_Rji'} {'type': 'FUNC', 'name': '_ZNSt3__125__num_get_signed_integralIxEET_PKcS3_Rji'} {'type': 'FUNC', 'name': '_ZNSt3__125notify_all_at_thread_exitERNS_18condition_variableENS_11unique_lockINS_5mutexEEE'}