This fixes some duplicate symbols which break Darwin bootstrap.
Tested x86_64-linux and powerpc64-linux, committed to trunk.
commit fa3a5af2feee0f9873ba1a9bdb84148dd122506c Author: Jonathan Wakely <jwak...@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