diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-12-20 00:19:40 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-12-20 00:19:40 +0000 |
| commit | 189486b85833690ab1ff75c604645ea3d22aa1e1 (patch) | |
| tree | fbd8fe1b91d641020d16ec372acced23fac22787 | |
| parent | 47356ebc5abca6d24cc4dc87b214f4b0616d1ae6 (diff) | |
| download | gcc-189486b85833690ab1ff75c604645ea3d22aa1e1.zip gcc-189486b85833690ab1ff75c604645ea3d22aa1e1.tar.gz gcc-189486b85833690ab1ff75c604645ea3d22aa1e1.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/locale-inst.cc | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a46a2b6..0572f17 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 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 |