Revert empty class parameter passing ABI changes.

[gcc.git] / libstdc++-v3 / include / bits / c++config

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index bde003c68a03e9cfb38b1ae5680632895ba99544..57024e40ec0de20263e3d23170a03a9706df650d 100644 (file)
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -84,32 +84,13 @@
 # define _GLIBCXX_DEPRECATED
 #endif
 
-#if __cplusplus
-
 // Macros for ABI tag attributes.
 #ifndef _GLIBCXX_ABI_TAG_CXX11
 # define _GLIBCXX_ABI_TAG_CXX11 __attribute ((__abi_tag__ ("cxx11")))
 #endif
 
-#if __GXX_ABI_VERSION >= 1010
-namespace std
-{
-  inline namespace _V2 { }
-}
-# define _GLIBCXX_BEGIN_NAMESPACE_EMPTY_TYPES \
-  _GLIBCXX_END_NAMESPACE_VERSION \
-  namespace _V2 { \
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-# define _GLIBCXX_END_NAMESPACE_EMPTY_TYPES \
-  _GLIBCXX_END_NAMESPACE_VERSION \
-  } \
-  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-# define _GLIBCXX_ABI_TAG_EMPTY __attribute ((__abi_tag__ ("cxxempty")))
-#else
-# define _GLIBCXX_BEGIN_NAMESPACE_EMPTY_TYPES
-# define _GLIBCXX_END_NAMESPACE_EMPTY_TYPES
-# define _GLIBCXX_ABI_TAG_EMPTY
-#endif
+
+#if __cplusplus
 
 // Macro for constexpr, to support in mixed 03/0x mode.
 #ifndef _GLIBCXX_CONSTEXPR