diff --git a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc index ba4b1413bf9ca7ad606067cebab5f471e966d8ed..14a7f9cfcb1cbf9824179266f0f06705a596f776 100644 --- a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc +++ b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc @@ -42,6 +42,10 @@ # error This file should not be compiled for this configuration. #endif +#if __has_cpp_attribute(clang::require_constant_initialization) +# define __constinit [[clang::require_constant_initialization]] +#endif + namespace { struct io_error_category final : std::error_category diff --git a/libstdc++-v3/src/c++11/future.cc b/libstdc++-v3/src/c++11/future.cc index 488ff17a1e6f92dc32d0071e936fb8217cb71cfc..c52c057ba1d4acbacd9b54bacd2c9c42f477241e 100644 --- a/libstdc++-v3/src/c++11/future.cc +++ b/libstdc++-v3/src/c++11/future.cc @@ -25,6 +25,10 @@ #include <future> #include <bits/functexcept.h> +#if __has_cpp_attribute(clang::require_constant_initialization) +# define __constinit [[clang::require_constant_initialization]] +#endif + namespace { struct future_error_category final : public std::error_category diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index 789f2b45382b7bdecda6b7b98c6225305a446e63..7b1a5a20637def5cb95e151c099fca9c0f2f8caf 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -37,6 +37,10 @@ #include <windows.h> #endif +#if __has_cpp_attribute(clang::require_constant_initialization) +# define __constinit [[clang::require_constant_initialization]] +#endif + namespace { using std::string; diff --git a/libstdc++-v3/src/c++17/memory_resource.cc b/libstdc++-v3/src/c++17/memory_resource.cc index 5cdb35df2cd02b1f490e96c9ff42d90d1c9b78c2..bb6334c96947d6d3a3c5d69890c4f6f9479f01f5 100644 --- a/libstdc++-v3/src/c++17/memory_resource.cc +++ b/libstdc++-v3/src/c++17/memory_resource.cc @@ -32,6 +32,10 @@ # include <bits/move.h> // std::__exchange #endif +#if __has_cpp_attribute(clang::require_constant_initialization) +# define __constinit [[clang::require_constant_initialization]] +#endif + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION