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.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bd9318debbd7df01037a1d6781cdfc7a659ebbd4..883ee43b52060794e88abdece5bcfe259b9b9681 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2014-12-23  Jonathan Wakely  <jwakely@redhat.com>
+
+       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  <paolo.carlini@oracle.com>
 
        * 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 c4345af34a62fb6ecb2ebb299745bf63244a207b..829159c1ead355078b1838026cdf815778243abd 100644 (file)
--- 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 2ce23f9e497a5fce62fb0cff8b2f40515948a4db..619bf37edbf781e1210758d5b61df2b065520b1a 100644 (file)
--- 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 9c1a1c1333f9ba017b51dd6e0297ae079d1eef27..93144e893173b640c8da7c7a0c04f61bd35ceac5 100644 (file)
--- 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 a25ce206e8f3928ebe0ada647baea2f9f4fb0cec..a892d5d52d9d95337a2870417e2b39a424ba3abf 100644 (file)
--- 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 <locale>
-namespace std _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-_GLIBCXX_BEGIN_NAMESPACE_CXX11
-  template istreambuf_iterator<C> time_get<C, istreambuf_iterator<C> >::get(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*, char, char) const;
-  template istreambuf_iterator<C> time_get<C, istreambuf_iterator<C> >::do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*, char, char) const;
-  template istreambuf_iterator<C> time_get<C, istreambuf_iterator<C> >::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 e3e540d64f634fe51a00ff9474b0c6da20ffc1f7..9d13a4e5485a1db5c6d312924432bfcb6e5d1663 100644 (file)
--- 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 bd8fd3d778d11cc54dcec7b9d15fb68a9ebf7014..9a2a27f0da352bf263f7cdb5ad2bbbd8059a3f6a 100644 (file)
--- 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