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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a46a2b6d0d3f301fd07f860fbb27b76f2add2cf5..0572f17e1e4fac1055050b5d147d38c9a0ba2edb 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-20  Jonathan Wakely  <jwakely@redhat.com>
+
+       * src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char):
+       Only compile for old ABI.
+
 2014-12-19  Jonathan Wakely  <jwakely@redhat.com>
 
        * 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 dd479218483ac275aac69f781a8addcca1ed494a..6cd361687d61f7297e1b03db10795755ce76e825 100644 (file)
--- 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