[committed] libstdc++: Stop defining C++0x compat symbols for versioned namespace
Commit Message
Tested x86_64-linux, --enable-symvers=gnu and
--enable-symvers=gnu-versioned-namespace.
Pushed to trunk.
-- >8 --
The src/c++11/compatibility*-c++0x.cc files define symbols that need to
be exported for ancient versions of libstdc++.so.6 due to changes
between C++0x and the final C++11 standard. Those symbols are not needed
in the libstdc++.so.8 library, and we can skip building them entirely.
This also fixes the build failure I introduced last week when making the
versioned namespace config not use the _V2 namespace for compat symbols.
libstdc++-v3/ChangeLog:
* src/Makefile.am [ENABLE_SYMVERS_GNU_NAMESPACE] (cxx11_sources):
Do not build the compatibility*-c++0x.cc objects.
* src/Makefile.in: Regenerate.
* src/c++11/compatibility-c++0x.cc [_GLIBCXX_INLINE_VERSION]:
Refuse to build for the versioned namespace.
* src/c++11/compatibility-chrono.cc: Likewise.
* src/c++11/compatibility-condvar.cc: Likewise.
* src/c++11/compatibility-thread-c++0x.cc: Likewise.
* src/c++11/chrono.cc (system_clock, steady_clock):
Use macros to define in inline namespace _V2, matching the
declarations in <system_error>.
* src/c++11/system_error.cc (system_category, generic_category):
Likewise.
---
libstdc++-v3/src/Makefile.am | 16 +++++++---
libstdc++-v3/src/Makefile.in | 31 ++++++++++++-------
libstdc++-v3/src/c++11/chrono.cc | 5 ++-
libstdc++-v3/src/c++11/compatibility-c++0x.cc | 4 +++
.../src/c++11/compatibility-chrono.cc | 4 +++
.../src/c++11/compatibility-condvar.cc | 4 +++
.../src/c++11/compatibility-thread-c++0x.cc | 4 +++
libstdc++-v3/src/c++11/system_error.cc | 10 ++++--
8 files changed, 55 insertions(+), 23 deletions(-)
@@ -96,6 +96,16 @@ else
ldbl_alt128_compat_sources =
endif
+if ENABLE_SYMVERS_GNU_NAMESPACE
+cxx0x_compat_sources =
+else
+cxx0x_compat_sources = \
+ compatibility-atomic-c++0x.cc \
+ compatibility-c++0x.cc \
+ compatibility-chrono.cc \
+ compatibility-condvar.cc \
+ compatibility-thread-c++0x.cc
+endif
parallel_compat_sources = \
compatibility-parallel_list.cc compatibility-parallel_list-2.cc
@@ -108,11 +118,7 @@ cxx98_sources = \
${ldbl_compat_sources}
cxx11_sources = \
- compatibility-c++0x.cc \
- compatibility-atomic-c++0x.cc \
- compatibility-thread-c++0x.cc \
- compatibility-chrono.cc \
- compatibility-condvar.cc \
+ ${cxx0x_compat_sources} \
${ldbl_alt128_compat_sources}
libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources)
@@ -43,8 +43,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace chrono
{
- // XXX GLIBCXX_ABI Deprecated
- inline namespace _V2 {
+_GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(_V2)
constexpr bool system_clock::is_steady;
@@ -94,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
}
- } // end inline namespace _V2
+_GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)
} // namespace chrono
_GLIBCXX_END_NAMESPACE_VERSION
@@ -40,6 +40,10 @@
# error "compatibility-c++0x.cc must be compiled with -std=gnu++0x"
#endif
+#if _GLIBCXX_INLINE_VERSION
+# error "compatibility-thread-c++0x.cc is not needed for gnu-versioned-namespace"
+#endif
+
#ifdef _GLIBCXX_SHARED
namespace std _GLIBCXX_VISIBILITY(default)
@@ -24,6 +24,10 @@
#include <bits/c++config.h>
+#if _GLIBCXX_INLINE_VERSION
+# error "compatibility-thread-c++0x.cc is not needed for gnu-versioned-namespace"
+#endif
+
#ifdef _GLIBCXX_USE_C99_STDINT_TR1
#ifdef _GLIBCXX_USE_GETTIMEOFDAY
@@ -28,6 +28,10 @@
# error "compatibility-condvar-c++0x.cc must be compiled with -std=gnu++11"
#endif
+#if _GLIBCXX_INLINE_VERSION
+# error "compatibility-thread-c++0x.cc is not needed for gnu-versioned-namespace"
+#endif
+
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
#define condition_variable_any condition_variable_anyXX
@@ -35,6 +35,10 @@
# error "compatibility-thread-c++0x.cc must be compiled with -std=gnu++0x"
#endif
+#if _GLIBCXX_INLINE_VERSION
+# error "compatibility-thread-c++0x.cc is not needed for gnu-versioned-namespace"
+#endif
+
#define _GLIBCXX_ASM_SYMVER(cur, old, version) \
asm (".symver " #cur "," #old "@@@" #version);
@@ -526,11 +526,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
error_category::~error_category() = default;
- const error_category&
- _V2::system_category() noexcept { return system_category_instance.obj; }
+_GLIBCXX_BEGIN_INLINE_ABI_NAMESPACE(_V2)
const error_category&
- _V2::generic_category() noexcept { return generic_category_instance.obj; }
+ system_category() noexcept { return system_category_instance.obj; }
+
+ const error_category&
+ generic_category() noexcept { return generic_category_instance.obj; }
+
+_GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)
system_error::~system_error() = default;