This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [patch] New std::string implementation
- From: Jonathan Wakely <jwakely at redhat dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Sat, 20 Dec 2014 00:19:51 +0000
- Subject: Re: [patch] New std::string implementation
- Authentication-results: sourceware.org; auth=none
- References: <20141114154330 dot GH5191 at redhat dot com> <20141128152448 dot GQ5191 at redhat dot com> <20141128165532 dot GR5191 at redhat dot com> <20141219182333 dot GE3134 at redhat dot com>
This fixes some duplicate symbols which break Darwin bootstrap.
Tested x86_64-linux and powerpc64-linux, committed to trunk.
commit fa3a5af2feee0f9873ba1a9bdb84148dd122506c
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Dec 19 23:44:01 2014 +0000
Fix duplicate symbol errors in Darwin bootstrap.
* src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char):
Only compile for old ABI.
diff --git a/libstdc++-v3/src/c++98/locale-inst.cc b/libstdc++-v3/src/c++98/locale-inst.cc
index dd47921..6cd3616 100644
--- a/libstdc++-v3/src/c++98/locale-inst.cc
+++ b/libstdc++-v3/src/c++98/locale-inst.cc
@@ -345,6 +345,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
has_facet<messages<C> >(const locale&);
+#if ! _GLIBCXX_USE_CXX11_ABI
// locale functions.
template
C*
@@ -364,6 +365,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
__int_to_char(C*, unsigned long long, const C*,
ios_base::fmtflags, bool);
#endif
+#endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace