diff options
author | Louis Dionne <ldionne.2@gmail.com> | 2022-03-23 13:17:06 -0400 |
---|---|---|
committer | Louis Dionne <ldionne.2@gmail.com> | 2022-03-31 09:34:41 -0400 |
commit | 19246b0779a255d870284d32e5a7487af4f233f6 (patch) | |
tree | 0fa85999d34811c997f9baa362c7db1a4b710aaf | |
parent | 33b3c86afab06ad61d46456c85c0b565cfff8287 (diff) | |
download | llvm-19246b0779a255d870284d32e5a7487af4f233f6.zip llvm-19246b0779a255d870284d32e5a7487af4f233f6.tar.gz llvm-19246b0779a255d870284d32e5a7487af4f233f6.tar.bz2 |
[libc++] Remove the __libcpp_version file
It seems to have been added back in 761e42fa3dd72 for Clang to use it,
however it seems to have never been used for that purpose, so it is
probably fine to remove it.
Differential Revision: https://reviews.llvm.org/D122330
-rw-r--r-- | libcxx/docs/Contributing.rst | 7 | ||||
-rw-r--r-- | libcxx/include/CMakeLists.txt | 1 | ||||
-rw-r--r-- | libcxx/include/__libcpp_version | 1 | ||||
-rw-r--r-- | libcxx/test/libcxx/libcpp_version.pass.cpp | 28 | ||||
-rw-r--r-- | libcxx/test/libcxx/lint/lint_headers.sh.py | 1 | ||||
-rwxr-xr-x | libcxx/utils/generate_assertion_tests.py | 2 | ||||
-rwxr-xr-x | libcxx/utils/generate_private_header_tests.py | 2 | ||||
-rwxr-xr-x | libcxx/utils/graph_header_deps.py | 2 |
8 files changed, 6 insertions, 38 deletions
diff --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst index d2bb76e..b812b95 100644 --- a/libcxx/docs/Contributing.rst +++ b/libcxx/docs/Contributing.rst @@ -67,10 +67,9 @@ Post-release check list 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`` -5. Update ``_LIBUNWIND_VERSION`` in ``libunwind/include/__libunwind_config.h`` +2. Update the version number in ``libcxx/docs/conf.py`` +3. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h`` +4. Update ``_LIBUNWIND_VERSION`` in ``libunwind/include/__libunwind_config.h`` Exporting new symbols from the library ====================================== diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt index c4ee889..c26470e 100644 --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -267,7 +267,6 @@ set(files __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 index 9e70369..0000000 --- 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 index 8444d1e..0000000 --- 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 index 94adac3..9075044 100644 --- a/libcxx/test/libcxx/lint/lint_headers.sh.py +++ b/libcxx/test/libcxx/lint/lint_headers.sh.py @@ -14,7 +14,6 @@ def exclude_from_consideration(path): 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_assertion_tests.py b/libcxx/utils/generate_assertion_tests.py index 7ef30bc..7f9888e 100755 --- a/libcxx/utils/generate_assertion_tests.py +++ b/libcxx/utils/generate_assertion_tests.py @@ -56,7 +56,7 @@ header_restrictions = { private_headers_still_public_in_modules = [ '__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' ] def find_script(file): diff --git a/libcxx/utils/generate_private_header_tests.py b/libcxx/utils/generate_private_header_tests.py index 810657e..32b08ca 100755 --- a/libcxx/utils/generate_private_header_tests.py +++ b/libcxx/utils/generate_private_header_tests.py @@ -54,7 +54,7 @@ def is_still_public(path): 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 index 8c19165..1fe0fcc 100755 --- a/libcxx/utils/graph_header_deps.py +++ b/libcxx/utils/graph_header_deps.py @@ -14,7 +14,7 @@ import sys 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): |