From 189486b85833690ab1ff75c604645ea3d22aa1e1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 20 Dec 2014 00:19:40 +0000 Subject: [PATCH] Fix duplicate symbol errors in Darwin bootstrap. * src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char): Only compile for old ABI. From-SVN: r218984 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/c++98/locale-inst.cc | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a46a2b6d0d3..0572f17e1e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-12-20 Jonathan Wakely + + * src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char): + Only compile for old ABI. + 2014-12-19 Jonathan Wakely * acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_CXX11_ABI): Remove. diff --git a/libstdc++-v3/src/c++98/locale-inst.cc b/libstdc++-v3/src/c++98/locale-inst.cc index dd479218483..6cd361687d6 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 >(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 -- 2.30.2