procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix versioned namespace build

Browse source 
The recent changes to define various std::exception_ptr functions inline
included a change so that the definitions of those functions would be
omitted for the ABI unstable gnu-versioned-namespace configuration. That
change was incorrect, because the existing functions that are gated by
the _GLIBCXX_EH_PTR_COMPAT macro are always needed even for the
versioned namespace.

This change introduces a new macro to control whether operator== is
defined as deleted or not, distinct from the existing macro. The new
macro is not defined for versioned namespace builds, but the old macro
still is.

libstdc++-v3/ChangeLog:

	* libsupc++/eh_ptr.cc (_GLIBCXX_EH_PTR_RELOPS_COMPAT): Define
	new macro.
	* libsupc++/exception_ptr.h (_GLIBCXX_EH_PTR_USED): Check new
	macro instead of _GLIBCXX_EH_PTR_COMPAT.
	(operator==): Likewise.
This commit is contained in:
Jonathan Wakely 2021-02-11 16:18:19 +00:00
parent ce43c90604
commit bc0f7db7eb
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libstdc++-v3/libsupc++/eh_ptr.cc
View file

@ -25,11 +25,15 @@
#include <bits/c++config.h>
#include "eh_atomics.h"
#if ! _GLIBCXX_INLINE_VERSION
// This macro causes exception_ptr to declare an older API (with corresponding
// definitions in this file) and to mark some inline functions as "used" so
// that definitions will be emitted in this translation unit.
// definitions in this file).
#define _GLIBCXX_EH_PTR_COMPAT
#if ! _GLIBCXX_INLINE_VERSION
// This macro causes some inline functions in exception_ptr to be marked
// as "used" so that definitions will be emitted in this translation unit.
// We need this because those functions were not inline in previous releases.
#define _GLIBCXX_EH_PTR_RELOPS_COMPAT
#endif
#include <exception>

4
libstdc++-v3/libsupc++/exception_ptr.h
View file

@ -39,7 +39,7 @@
#include <typeinfo>
#include <new>
#ifdef _GLIBCXX_EH_PTR_COMPAT
#ifdef _GLIBCXX_EH_PTR_RELOPS_COMPAT
# define _GLIBCXX_EH_PTR_USED __attribute__((__used__))
#else
# define _GLIBCXX_EH_PTR_USED
@ -153,7 +153,7 @@ namespace std
#endif
#if __cpp_impl_three_way_comparison >= 201907L \
&& ! defined _GLIBCXX_EH_PTR_COMPAT
&& ! defined _GLIBCXX_EH_PTR_RELOPS_COMPAT
friend bool
operator==(const exception_ptr&, const exception_ptr&) noexcept = default;
#else