From 28630cd6bcf7f67d716c9d927331c75e3ea7aac0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Dec 2014 23:30:33 +0000 Subject: [PATCH] Compile locale-inst.cc and wlocale-inst.cc as C++11. PR libstdc++/64389 * src/c++11/Makefile.am: Add locale-inst.cc and wlocale-inst.cc. * src/c++11/Makefile.in: Regenerate. * src/c++11/locale-inst.cc: Move from src/c++98/. * src/c++11/wlocale-inst.cc: Likewise. * src/c++11/cxx11-locale-inst.cc: Adjust path to locale-inst.cc. * src/c++11/string-inst.cc: Remove time_get instantiations. * src/c++98/Makefile.am: Remove locale-inst.cc and wlocale-inst.cc. * src/c++98/Makefile.in: Regenerate. * src/c++98/locale-inst.cc: Move to src/c++11/. * src/c++98/wlocale-inst.cc: Likewise. From-SVN: r219050 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/src/c++11/Makefile.am | 2 ++ libstdc++-v3/src/c++11/Makefile.in | 9 ++++++--- libstdc++-v3/src/c++11/cxx11-locale-inst.cc | 2 +- libstdc++-v3/src/{c++98 => c++11}/locale-inst.cc | 0 libstdc++-v3/src/c++11/string-inst.cc | 13 ------------- libstdc++-v3/src/{c++98 => c++11}/wlocale-inst.cc | 0 libstdc++-v3/src/c++98/Makefile.am | 4 +--- libstdc++-v3/src/c++98/Makefile.in | 7 ++----- 9 files changed, 26 insertions(+), 25 deletions(-) rename libstdc++-v3/src/{c++98 => c++11}/locale-inst.cc (100%) rename libstdc++-v3/src/{c++98 => c++11}/wlocale-inst.cc (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bd9318debbd..883ee43b520 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2014-12-23 Jonathan Wakely + + PR libstdc++/64389 + * src/c++11/Makefile.am: Add locale-inst.cc and wlocale-inst.cc. + * src/c++11/Makefile.in: Regenerate. + * src/c++11/locale-inst.cc: Move from src/c++98/. + * src/c++11/wlocale-inst.cc: Likewise. + * src/c++11/cxx11-locale-inst.cc: Adjust path to locale-inst.cc. + * src/c++11/string-inst.cc: Remove time_get instantiations. + * src/c++98/Makefile.am: Remove locale-inst.cc and wlocale-inst.cc. + * src/c++98/Makefile.in: Regenerate. + * src/c++98/locale-inst.cc: Move to src/c++11/. + * src/c++98/wlocale-inst.cc: Likewise. + 2014-12-22 Paolo Carlini * include/bits/basic_string.h: Fix _S_local_capacity for diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index c4345af34a6..829159c1ead 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -96,10 +96,12 @@ inst_sources = \ ios-inst.cc \ iostream-inst.cc \ istream-inst.cc \ + locale-inst.cc \ ostream-inst.cc \ sstream-inst.cc \ streambuf-inst.cc \ string-inst.cc \ + wlocale-inst.cc \ wstring-inst.cc else # XTEMPLATE_FLAGS = diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 2ce23f9e497..619bf37edbf 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -85,9 +85,10 @@ am__objects_3 = chrono.lo condition_variable.lo cow-stdexcept.lo \ @ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_5 = $(am__objects_4) \ @ENABLE_EXTERN_TEMPLATE_TRUE@ ext11-inst.lo fstream-inst.lo \ @ENABLE_EXTERN_TEMPLATE_TRUE@ ios-inst.lo iostream-inst.lo \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ istream-inst.lo ostream-inst.lo \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ sstream-inst.lo streambuf-inst.lo \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ string-inst.lo wstring-inst.lo +@ENABLE_EXTERN_TEMPLATE_TRUE@ istream-inst.lo locale-inst.lo \ +@ENABLE_EXTERN_TEMPLATE_TRUE@ ostream-inst.lo sstream-inst.lo \ +@ENABLE_EXTERN_TEMPLATE_TRUE@ streambuf-inst.lo string-inst.lo \ +@ENABLE_EXTERN_TEMPLATE_TRUE@ wlocale-inst.lo wstring-inst.lo am_libc__11convenience_la_OBJECTS = $(am__objects_3) $(am__objects_5) libc__11convenience_la_OBJECTS = $(am_libc__11convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -385,10 +386,12 @@ sources = \ @ENABLE_EXTERN_TEMPLATE_TRUE@ ios-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ iostream-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ istream-inst.cc \ +@ENABLE_EXTERN_TEMPLATE_TRUE@ locale-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ ostream-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ sstream-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ streambuf-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ string-inst.cc \ +@ENABLE_EXTERN_TEMPLATE_TRUE@ wlocale-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ wstring-inst.cc libc__11convenience_la_SOURCES = $(sources) $(inst_sources) diff --git a/libstdc++-v3/src/c++11/cxx11-locale-inst.cc b/libstdc++-v3/src/c++11/cxx11-locale-inst.cc index 9c1a1c1333f..93144e89317 100644 --- a/libstdc++-v3/src/c++11/cxx11-locale-inst.cc +++ b/libstdc++-v3/src/c++11/cxx11-locale-inst.cc @@ -36,4 +36,4 @@ # define C char # define C_is_char #endif -# include "../c++98/locale-inst.cc" +# include "locale-inst.cc" diff --git a/libstdc++-v3/src/c++98/locale-inst.cc b/libstdc++-v3/src/c++11/locale-inst.cc similarity index 100% rename from libstdc++-v3/src/c++98/locale-inst.cc rename to libstdc++-v3/src/c++11/locale-inst.cc diff --git a/libstdc++-v3/src/c++11/string-inst.cc b/libstdc++-v3/src/c++11/string-inst.cc index a25ce206e8f..a892d5d52d9 100644 --- a/libstdc++-v3/src/c++11/string-inst.cc +++ b/libstdc++-v3/src/c++11/string-inst.cc @@ -113,16 +113,3 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace - -// TODO does not belong here! -#include -namespace std _GLIBCXX_VISIBILITY(default) -{ -_GLIBCXX_BEGIN_NAMESPACE_VERSION -_GLIBCXX_BEGIN_NAMESPACE_CXX11 - template istreambuf_iterator time_get >::get(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*, char, char) const; - template istreambuf_iterator time_get >::do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*, char, char) const; - template istreambuf_iterator time_get >::get(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*, const char_type*, const char_type*) const; -_GLIBCXX_END_NAMESPACE_CXX11 -_GLIBCXX_END_NAMESPACE_VERSION -} // namespace diff --git a/libstdc++-v3/src/c++98/wlocale-inst.cc b/libstdc++-v3/src/c++11/wlocale-inst.cc similarity index 100% rename from libstdc++-v3/src/c++98/wlocale-inst.cc rename to libstdc++-v3/src/c++11/wlocale-inst.cc diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am index e3e540d64f6..9d13a4e5485 100644 --- a/libstdc++-v3/src/c++98/Makefile.am +++ b/libstdc++-v3/src/c++98/Makefile.am @@ -108,9 +108,7 @@ inst_sources = \ allocator-inst.cc \ concept-inst.cc \ ext-inst.cc \ - locale-inst.cc \ - misc-inst.cc \ - wlocale-inst.cc + misc-inst.cc else # XTEMPLATE_FLAGS = inst_sources = diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in index bd8fd3d778d..9a2a27f0da3 100644 --- a/libstdc++-v3/src/c++98/Makefile.in +++ b/libstdc++-v3/src/c++98/Makefile.in @@ -77,8 +77,7 @@ am__objects_3 = $(am__objects_2) atomicity.lo codecvt_members.lo \ numeric_members.lo time_members.lo @ENABLE_EXTERN_TEMPLATE_TRUE@am__objects_4 = allocator-inst.lo \ @ENABLE_EXTERN_TEMPLATE_TRUE@ concept-inst.lo ext-inst.lo \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ locale-inst.lo misc-inst.lo \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ wlocale-inst.lo +@ENABLE_EXTERN_TEMPLATE_TRUE@ misc-inst.lo am__objects_5 = parallel_settings.lo am__objects_6 = basic_file.lo c++locale.lo $(am__objects_4) \ $(am__objects_5) @@ -367,9 +366,7 @@ host_sources_extra = \ @ENABLE_EXTERN_TEMPLATE_TRUE@ allocator-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ concept-inst.cc \ @ENABLE_EXTERN_TEMPLATE_TRUE@ ext-inst.cc \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ locale-inst.cc \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ misc-inst.cc \ -@ENABLE_EXTERN_TEMPLATE_TRUE@ wlocale-inst.cc +@ENABLE_EXTERN_TEMPLATE_TRUE@ misc-inst.cc parallel_sources = parallel_settings.cc -- 2.30.2