From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 20 Dec 2014 00:19:40 +0000 (+0000)
Subject: Fix duplicate symbol errors in Darwin bootstrap.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e28babd199a81ced4eb07ef9b65c13c42e0d830;p=thirdparty%2Fgcc.git

Fix duplicate symbol errors in Darwin bootstrap.

	* src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char):
	Only compile for old ABI.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218984 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a46a2b6d0d3f..0572f17e1e4f 100644
--- 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 dd479218483a..6cd361687d61 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