diff --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst --- a/libcxx/docs/Contributing.rst +++ b/libcxx/docs/Contributing.rst @@ -67,9 +67,8 @@ After branching for an LLVM release: 1. Update ``_LIBCPP_VERSION`` in ``libcxx/include/__config`` -2. Update the ``libcxx/include/__libcpp_version`` file -3. Update the version number in ``libcxx/docs/conf.py`` -4. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h`` +2. Update the version number in ``libcxx/docs/conf.py`` +3. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h`` Exporting new symbols from the library ====================================== diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -266,7 +266,6 @@ __iterator/sortable.h __iterator/unreachable_sentinel.h __iterator/wrap_iter.h - __libcpp_version __locale __mbstate_t.h __memory/addressof.h diff --git a/libcxx/include/__libcpp_version b/libcxx/include/__libcpp_version deleted file mode 100644 --- a/libcxx/include/__libcpp_version +++ /dev/null @@ -1 +0,0 @@ -15000 diff --git a/libcxx/test/libcxx/libcpp_version.pass.cpp b/libcxx/test/libcxx/libcpp_version.pass.cpp deleted file mode 100644 --- a/libcxx/test/libcxx/libcpp_version.pass.cpp +++ /dev/null @@ -1,28 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -// Test that the __libcpp_version file matches the value of _LIBCPP_VERSION - -#include <__config> - -#ifndef _LIBCPP_VERSION -#error _LIBCPP_VERSION must be defined -#endif - -static const int libcpp_version = -#include <__libcpp_version> -; - -static_assert(_LIBCPP_VERSION == libcpp_version, - "_LIBCPP_VERSION doesn't match __libcpp_version"); - -int main(int, char**) { - - - return 0; -} diff --git a/libcxx/test/libcxx/lint/lint_headers.sh.py b/libcxx/test/libcxx/lint/lint_headers.sh.py --- a/libcxx/test/libcxx/lint/lint_headers.sh.py +++ b/libcxx/test/libcxx/lint/lint_headers.sh.py @@ -14,7 +14,6 @@ path.endswith('.modulemap') or os.path.basename(path) == '__config' or os.path.basename(path) == '__config_site.in' or - os.path.basename(path) == '__libcpp_version' or not os.path.isfile(path) ) diff --git a/libcxx/utils/generate_private_header_tests.py b/libcxx/utils/generate_private_header_tests.py --- a/libcxx/utils/generate_private_header_tests.py +++ b/libcxx/utils/generate_private_header_tests.py @@ -54,7 +54,7 @@ return not rp.startswith('__support') and rp not in [ "__assert", "__bsd_locale_defaults.h", "__bsd_locale_fallbacks.h", "__config", "__config_site.in", "__debug", "__hash_table", - "__libcpp_version", "__threading_support", "__tree", "__undef_macros" + "__threading_support", "__tree", "__undef_macros" ] diff --git a/libcxx/utils/graph_header_deps.py b/libcxx/utils/graph_header_deps.py --- a/libcxx/utils/graph_header_deps.py +++ b/libcxx/utils/graph_header_deps.py @@ -14,7 +14,7 @@ def is_config_header(h): - return os.path.basename(h) in ['__config', '__libcpp_version', '__undef_macros', 'version'] + return os.path.basename(h) in ['__config', '__undef_macros', 'version'] def is_experimental_header(h):