diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-12 00:39:38 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-12 00:39:38 +0000 |
| commit | 022fc2dfc3cf719d950c552ad5ae999d198fe25d (patch) | |
| tree | 767c647181b9eefba945e3e5a20f2016a254f9dc /libstdc++-v3/src | |
| parent | daacadf1a8a0997837d8d3dcb43dd1e0edf3896b (diff) | |
| download | ppe42-gcc-022fc2dfc3cf719d950c552ad5ae999d198fe25d.tar.gz ppe42-gcc-022fc2dfc3cf719d950c552ad5ae999d198fe25d.zip | |
2013-02-11 Benjamin Kosnik <bkoz@redhat.com>
* src/c++11/Makefile.am (hashtable_c++0x.lo, hashtable_c++0x.o):
Use -fimplicit-templates.
* src/c++11/Makefile.in: Regenerate.
* src/c++11/hashtable_c++0x.cc: Remove instantiation for
std::lower_bound template.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195966 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.in | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/hashtable_c++0x.cc | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 89ee335a1e3..e7b48acef46 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -60,6 +60,13 @@ vpath % $(top_srcdir)/src/c++11 libc__11convenience_la_SOURCES = $(sources) $(inst_sources) +# Use special rules for the hashtable.cc file so that all +# the generated template functions are also instantiated. +hashtable_c++0x.lo: hashtable_c++0x.cc + $(LTCXXCOMPILE) -fimplicit-templates -c $< +hashtable_c++0x.o: hashtable_c++0x.cc + $(CXXCOMPILE) -fimplicit-templates -c $< + # AM_CXXFLAGS needs to be in each subdirectory so that it can be # modified in a per-library or per-sub-library way. Need to manually # set this option because CONFIG_CXXFLAGS has to be after diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 793bbae40ea..a410748a4b8 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -627,6 +627,13 @@ uninstall-am: vpath % $(top_srcdir)/src/c++11 +# Use special rules for the hashtable.cc file so that all +# the generated template functions are also instantiated. +hashtable_c++0x.lo: hashtable_c++0x.cc + $(LTCXXCOMPILE) -fimplicit-templates -c $< +hashtable_c++0x.o: hashtable_c++0x.cc + $(CXXCOMPILE) -fimplicit-templates -c $< + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libstdc++-v3/src/c++11/hashtable_c++0x.cc b/libstdc++-v3/src/c++11/hashtable_c++0x.cc index b6a56bcc809..7617c58576b 100644 --- a/libstdc++-v3/src/c++11/hashtable_c++0x.cc +++ b/libstdc++-v3/src/c++11/hashtable_c++0x.cc @@ -94,11 +94,4 @@ namespace __detail _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail - - // Instantiations. - template - const unsigned long* - lower_bound<const unsigned long*, size_t>(const unsigned long*, - const unsigned long*, - const size_t&); } // namespace std |
