From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 26CF93858437; Mon, 7 Mar 2022 15:11:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26CF93858437 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-7522] libstdc++: Use visibility pragmas instead of attributes [PR104807] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 111754595cf8d3a8ae7063a42ac4cea18a304711 X-Git-Newrev: 4cb935cb69f12088975fa7f6907c6ace0580e2dd Message-Id: <20220307151110.26CF93858437@sourceware.org> Date: Mon, 7 Mar 2022 15:11:10 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2022 15:11:10 -0000 https://gcc.gnu.org/g:4cb935cb69f12088975fa7f6907c6ace0580e2dd commit r12-7522-g4cb935cb69f12088975fa7f6907c6ace0580e2dd Author: Jonathan Wakely Date: Mon Mar 7 15:07:05 2022 +0000 libstdc++: Use visibility pragmas instead of attributes [PR104807] The _GLIBCXX_PSEUDO_VISIBILITY macro isn't defined until after including os_defines.h, so we can't use _GLIBCXX_VISIBILITY early in c++config. Replace the uses of that macro with #pragma visibility push(default) instead. libstdc++-v3/ChangeLog: PR libstdc++/104807 * include/bits/c++config (__terminate, __glibcxx_assert_fail): Replace _GLIBCXX_VISIBILITY on function with visibility pragma. (__is_constant_evaluated): Add visibility pragma. Diff: --- libstdc++-v3/include/bits/c++config | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 6c134f13509..2798b9786dc 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -302,15 +302,16 @@ namespace std typedef decltype(nullptr) nullptr_t; #endif +#pragma GCC visibility push(default) // This allows the library to terminate without including all of // and without making the declaration of std::terminate visible to users. extern "C++" __attribute__ ((__noreturn__, __always_inline__)) - _GLIBCXX_VISIBILITY(default) inline void __terminate() _GLIBCXX_USE_NOEXCEPT { void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); terminate(); } +#pragma GCC visibility pop } #define _GLIBCXX_USE_DUAL_ABI @@ -506,6 +507,7 @@ namespace std namespace std { +#pragma GCC visibility push(default) // Internal version of std::is_constant_evaluated(). // This can be used without checking if the compiler supports the feature. // The macro _GLIBCXX_HAVE_IS_CONSTANT_EVALUATED can be used to check if @@ -523,6 +525,7 @@ namespace std return false; #endif } +#pragma GCC visibility pop } // Debug Mode implies checking assertions. @@ -553,13 +556,15 @@ namespace std # ifdef _GLIBCXX_VERBOSE_ASSERT namespace std { +#pragma GCC visibility push(default) // Avoid the use of assert, because we're trying to keep the // include out of the mix. - extern "C++" _GLIBCXX_NORETURN _GLIBCXX_VISIBILITY(default) + extern "C++" _GLIBCXX_NORETURN void __glibcxx_assert_fail(const char* __file, int __line, const char* __function, const char* __condition) _GLIBCXX_NOEXCEPT; +#pragma GCC visibility pop } #define __glibcxx_assert_impl(_Condition) \ if (__builtin_expect(!bool(_Condition), false)) \