procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix duplicate symbol errors in Darwin bootstrap.

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

From-SVN: r218984
This commit is contained in:
Jonathan Wakely 2014-12-20 00:19:40 +00:00 • committed by Jonathan Wakely
parent 47356ebc5a
commit 189486b858
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View file

@ -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.

2
libstdc++-v3/src/c++98/locale-inst.cc
View file

@ -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