diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 136 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.in | 41 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 229 | ||||
| -rw-r--r-- | libstdc++-v3/libio/Makefile.in | 16 | ||||
| -rw-r--r-- | libstdc++-v3/libmath/Makefile.in | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 59 | ||||
| -rw-r--r-- | libstdc++-v3/po/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 37 | ||||
| -rw-r--r-- | libstdc++-v3/src/stl-inst.cc | 24 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 8 | ||||
| -rwxr-xr-x | libstdc++-v3/testsuite_flags.in | 4 |
12 files changed, 438 insertions, 129 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3df63ec0733..f3bcd3bee57 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2001-09-05 Phil Edwards <pme@sources.redhat.com> + + * testsuite_flags.in: No longer need to search testsuite builddir. + * src/stl-inst.cc (__sink_unused_warning): Unused, remove. + * Makefile.am: The testsuite directory never needs to be made here. + * Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * libio/Makefile.in: Regenerate. + * libmath/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Regenerate. + * po/Makefile.in: Regenerate. + * src/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + 2001-09-04 Scott Johnston <scott@accom.com> Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> @@ -616,7 +630,7 @@ 2001-07-19 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> - * include/bits/stl_algo.h : Fix typos. + * include/bits/stl_algo.h : Fix typos. * testsuite/25_algorithms/unique.cc: New file. 2001-07-19 Phil Edwards <pme@sources.redhat.com> @@ -635,7 +649,7 @@ * src/locale.cc: Likewise. 2001-07-19 Gabriel Dos Reis <gdr@merlin.codesourcery.com> - Bert De Knuydt <Bert.Deknuydt@esat.kuleuven.ac.be> + Bert De Knuydt <Bert.Deknuydt@esat.kuleuven.ac.be> * src/gen-num-limits.cc (set_signals_handler): New function. Factor out signals setting. Set signal handler for SIGILL. @@ -649,9 +663,9 @@ 2001-07-18 Stephen M. Webb <stephen@bregmasoft..com> Roman Sulzhyk <roman_sulzhyk@yahoo.com> - libstdc++/3599 - * include/bits/ostream.tcc (ostream::put): Fixed error condition check. - * testsuite/27_io/streambuf.cc (test07): Added new regression test. + libstdc++/3599 + * include/bits/ostream.tcc (ostream::put): Fixed error condition check. + * testsuite/27_io/streambuf.cc (test07): Added new regression test. 2001-07-17 Stephen M. Webb <stephen@bregmasoft.com>r @@ -818,21 +832,21 @@ 2001-07-06 Gabriel Dos Reis <gdr@merlin.codesourcery.com> - * libmath/Makefile.am (EXTRA_DIST): Remove atan2f.c and expf.c - * libmath/Makefile.in: Regenerate. - * libmath/expf.c: Remove. - * libmath/atan2f.c: Likewise. + * libmath/Makefile.am (EXTRA_DIST): Remove atan2f.c and expf.c + * libmath/Makefile.in: Regenerate. + * libmath/expf.c: Remove. + * libmath/atan2f.c: Likewise. 2001-07-06 Daniel Jacobowitz <drow@mvista.com> - * configure.in: Remove NATIVE, NULL_TARGET. - Set CANADIAN only for Canadian crosses. Set xcompiling - for both Canadian crosses and host-x-host crosses. - * configure: Regenerated. + * configure.in: Remove NATIVE, NULL_TARGET. + Set CANADIAN only for Canadian crosses. Set xcompiling + for both Canadian crosses and host-x-host crosses. + * configure: Regenerated. 2001-07-06 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> - * include/bits/stl_vector.h (vector::_M_initialize_aux): Fix typo. + * include/bits/stl_vector.h (vector::_M_initialize_aux): Fix typo. 2001-07-05 Jason Merrill <jason_merrill@redhat.com> @@ -910,11 +924,11 @@ 2001-07-01 Stephen M. Webb <stephen@bregmasoft.com> * include/bits/stl_construct.h (construct): Remove. - (destroy): Remove. - (__destroy): Replaced by use of iterator_traits. + (destroy): Remove. + (__destroy): Replaced by use of iterator_traits. * include/bits/stl_deque.h: replaced HP iterator functions with iterator_traits. - (construct): changed to _Construct. + (construct): changed to _Construct. (destroy): changed to _Destroy. * include/bits/stl_tempbuf.h: Same. * include/bits/stl_tree.h: Same. @@ -1079,8 +1093,8 @@ 2001-06-26 Benjamin Kosnik <bkoz@redhat.com> Alexandre Petit-Bianco <apbianco@redhat.com> - * testsuite/21_strings/element_access.cc (test01): Chill Out Cafe - is on 41st, not 14th. + * testsuite/21_strings/element_access.cc (test01): Chill Out Cafe + is on 41st, not 14th. 2001-06-26 Benjamin Kosnik <bkoz@redhat.com> @@ -1267,9 +1281,9 @@ * include/bits/stl_raw_storage_iter.h: Format. Correct derivation. * testsuite/20_util/raw_storage_iterator.cc: Same. - * include/bits/stl_alloc.h (_S_chunk_alloc): Change malloc to - operator new. - (__mem_interface): New typedef for switching between malloc and new. + * include/bits/stl_alloc.h (_S_chunk_alloc): Change malloc to + operator new. + (__mem_interface): New typedef for switching between malloc and new. * testsuite/20_util/allocator_members.cc: New file. * testsuite/20_util/comparisons.cc: New file. @@ -1557,7 +1571,7 @@ * include/bits/c++config: Cleanup threading configuration macros. In particular, define __STL_GTHREADS macro which controls... * include/bits/stl_threads.h: ...a brand new gthr.h-based - configuration here. + configuration here. * config/c_io_stdio.h: Include staged gthr.h instead of local thread configuration file. Always use __gthread_mutex_t @@ -1740,8 +1754,8 @@ 2001-05-30 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> - * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Use - get_multilibs to find gcc. + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Use + get_multilibs to find gcc. 2001-05-30 Phil Edwards <pme@sources.redhat.com> @@ -1751,14 +1765,14 @@ 2001-05-29 Gabriel Dos Reis <gdr@merlin.codesourcery.com> - * include/c_std/bits/std_cstdlib.h:: Move C99 thingies to __gnu_cxx::. - * include/c_std/bits/std_cwchar.h (__gnu_cxx): Likewise. + * include/c_std/bits/std_cstdlib.h:: Move C99 thingies to __gnu_cxx::. + * include/c_std/bits/std_cwchar.h (__gnu_cxx): Likewise. 2001-05-27 Gabriel Dos Reis <gdr@merlin.codesourcery.com> - * include/c_std/bits/std_cmath.h: Move C99 functions in __gnu_cxx::. - * include/c_std/bits/std_cstdlib.h: Same. - * include/c_std/bits/std_cwchar.h: Same. + * include/c_std/bits/std_cmath.h: Move C99 functions in __gnu_cxx::. + * include/c_std/bits/std_cstdlib.h: Same. + * include/c_std/bits/std_cwchar.h: Same. 2001-05-30 Loren J. Rittle <ljrittle@acm.org> @@ -1782,10 +1796,10 @@ 2001-05-24 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> Phil Edwards <pme@sources.redhat.com> - Alexandre Oliva <aoliva@redhat.com> + Alexandre Oliva <aoliva@redhat.com> - * acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set glibcpp_srcdir - in an amd-safe manner. Revert glibcpp_prefixdir. + * acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set glibcpp_srcdir + in an amd-safe manner. Revert glibcpp_prefixdir. 2001-05-25 Gabriel Dos Reis <gdr@codesourcery.com> @@ -1913,9 +1927,9 @@ 2001-05-18 Angela Marie Thomas <angela@cygnus.com> - * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set flags - appropriately for remote testing and testing installed files without - a build dir. + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set flags + appropriately for remote testing and testing installed files without + a build dir. 2001-05-18 Benjamin Kosnik <bkoz@redhat.com> @@ -1927,9 +1941,9 @@ 2001-05-18 Gabriel Dos Reis <gdr@codesourcery.com> - * include/bits/std_valarray.h (valarray<>::operator[] const): - Return a const reference. - * testsuite/26_numerics/valarray_const_bracket.cc: New test. + * include/bits/std_valarray.h (valarray<>::operator[] const): + Return a const reference. + * testsuite/26_numerics/valarray_const_bracket.cc: New test. 2001-05-18 Alexandre Oliva <aoliva@redhat.com> @@ -1938,13 +1952,13 @@ 2001-05-18 Angela Marie Thomas <angela@cygnus.com> - * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-dg-test): Set - output_file based on the name of the testcase. + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-dg-test): Set + output_file based on the name of the testcase. 2001-05-18 Angela Marie Thomas <angela@cygnus.com> - * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Build - gluefile and use it if needs_status_wrapper is set. + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Build + gluefile and use it if needs_status_wrapper is set. 2001-05-18 Alexandre Oliva <aoliva@redhat.com> @@ -1972,11 +1986,11 @@ 2001-05-15 Zack Weinberg <zackw@stanford.edu> - * testsuite/21_strings/inserters_extractors.cc, - testsuite/27_io/istream_unformatted.cc, - testsuite/27_io/stringstream.cc: - Replace multi-line string constants with C89-style - concatenated string constants. + * testsuite/21_strings/inserters_extractors.cc, + testsuite/27_io/istream_unformatted.cc, + testsuite/27_io/stringstream.cc: + Replace multi-line string constants with C89-style + concatenated string constants. 2001-05-14 Richard Henderson <rth@redhat.com> @@ -2168,7 +2182,7 @@ 2001-04-24 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> - * include/ext/slist: Include required header files. + * include/ext/slist: Include required header files. 2001-04-23 Loren J. Rittle <ljrittle@acm.org> @@ -2338,8 +2352,8 @@ 2001-04-06 Joe Buck <jbuck@welsh-buck.org> - * stl_algobase.h (std::equal): avoid use of possibly-undefined - operator != (one line patch). + * stl_algobase.h (std::equal): avoid use of possibly-undefined + operator != (one line patch). 2001-04-06 Benjamin Kosnik <bkoz@redhat.com> @@ -2352,8 +2366,8 @@ 2001-04-06 Gabriel Dos Reis <gdr@codesourcery.com> - * include/c_std/bits/std_cmath.h: Get rid of C99 math macros. - * testsuite/26_numerics/c99_macros.cc: Add test. + * include/c_std/bits/std_cmath.h: Get rid of C99 math macros. + * testsuite/26_numerics/c99_macros.cc: Add test. 2001-04-06 Phil Edwards <pme@sources.redhat.com> @@ -2431,7 +2445,7 @@ 2001-04-04 Phil Edwards <pme@sources.redhat.com> * docs/doxygen/user.cfg.in: Extract all non-private members; - reduce confusing documentation output. + reduce confusing documentation output. 2001-04-04 Geoffrey Keating <geoffk@redhat.com> @@ -2453,8 +2467,8 @@ 2001-04-03 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> - * include/backward/fstream.h: Expose streampos to global - namespace. + * include/backward/fstream.h: Expose streampos to global + namespace. 2001-04-03 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> @@ -2727,7 +2741,7 @@ 2001-03-21 Theodore Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr> - * intclude/bits/basic_file.h: Fix typos in comments. + * intclude/bits/basic_file.h: Fix typos in comments. 2001-03-20 Richard Henderson <rth@redhat.com> @@ -2900,7 +2914,7 @@ * testsuite/27_io/istream_manip.cc (test01): Fix. 2001-03-06 Nathan Myers <ncm@cantrip.org> - Benjamin Kosnik <bkoz@redhat.com> + Benjamin Kosnik <bkoz@redhat.com> * include/c_std/bits/std_cerrno.h: Don't define errno in std::. * testsuite/17_intro/header_cerrno.cc (test01): New file. @@ -3307,7 +3321,7 @@ 2001-02-19 Andreas Jaeger <aj@suse.de> - * config/cpu/sparc/sparc64/bits/atomicity.h (__compare_and_swap): + * config/cpu/sparc/sparc64/bits/atomicity.h (__compare_and_swap): Fix typo. 2001-02-16 Greg Bumgardner <bumgard@roguewave.com> @@ -3494,7 +3508,7 @@ dejagnu/dg.exp. 2001-02-13 Dirk Mueller <dmuell@gmx.net> - Phil Edwards <pme@sources.redhat.com> + Phil Edwards <pme@sources.redhat.com> * include/backward/function.h: Do not use rel_ops for older headers either. @@ -3628,7 +3642,7 @@ (_S_copy_streambufs): Likewise. 2001-02-06 Hyman Rosen <Hyman.Rosen@kbcfp.com> - Phil Edwards <pme@sources.redhat.com> + Phil Edwards <pme@sources.redhat.com> * include/bits/std_istream.h (op>> signed,unsigned char): Must use reinterpret_cast, not static_cast. diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index ac3cda69852..62aae9b8693 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -35,13 +35,11 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs # compile time, execution time, and binary size. check-script: $(top_builddir)/mkcheck -(chmod + $(top_builddir)/mkcheck; \ - test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ cd testsuite; \ @glibcpp_builddir@/mkcheck 0) check-script-install: $(top_builddir)/mkcheck -(chmod + $(top_builddir)/mkcheck; \ - test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ cd testsuite; \ @glibcpp_builddir@/mkcheck 1) diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 3ddebfa3847..4d3af653585 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -172,7 +172,44 @@ MULTICLEAN = true # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. -AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)" +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "includedir=$(includedir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "NM=$(NM)" \ + "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ + "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ + "WERROR=$(WERROR)" ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADER = config.h @@ -452,13 +489,11 @@ mostlyclean distclean maintainer-clean # compile time, execution time, and binary size. check-script: $(top_builddir)/mkcheck -(chmod + $(top_builddir)/mkcheck; \ - test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ cd testsuite; \ @glibcpp_builddir@/mkcheck 0) check-script-install: $(top_builddir)/mkcheck -(chmod + $(top_builddir)/mkcheck; \ - test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \ cd testsuite; \ @glibcpp_builddir@/mkcheck 1) diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index e025474bcdb..a787dc1381a 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -158,42 +158,255 @@ glibcpp_builddir = @glibcpp_builddir@ bits_srcdir = ${glibcpp_srcdir}/include/bits bits_builddir = ./bits -bits_headers = ${bits_srcdir}/basic_file.h ${bits_srcdir}/basic_ios.h ${bits_srcdir}/basic_ios.tcc ${bits_srcdir}/basic_string.h ${bits_srcdir}/basic_string.tcc ${bits_srcdir}/boost_concept_check.h ${bits_srcdir}/char_traits.h ${bits_srcdir}/codecvt.h ${bits_srcdir}/concept_check.h ${bits_srcdir}/cpp_type_traits.h ${bits_srcdir}/fpos.h ${bits_srcdir}/fstream.tcc ${bits_srcdir}/functexcept.h ${bits_srcdir}/generic_shadow.h ${bits_srcdir}/gslice.h ${bits_srcdir}/gslice_array.h ${bits_srcdir}/indirect_array.h ${bits_srcdir}/ios_base.h ${bits_srcdir}/istream.tcc ${bits_srcdir}/locale_facets.h ${bits_srcdir}/locale_facets.tcc ${bits_srcdir}/localefwd.h ${bits_srcdir}/mask_array.h ${bits_srcdir}/ostream.tcc ${bits_srcdir}/pthread_allocimpl.h ${bits_srcdir}/stream_iterator.h ${bits_srcdir}/streambuf_iterator.h ${bits_srcdir}/slice.h ${bits_srcdir}/slice_array.h ${bits_srcdir}/sstream.tcc ${bits_srcdir}/std_algorithm.h ${bits_srcdir}/std_bitset.h ${bits_srcdir}/std_complex.h ${bits_srcdir}/std_deque.h ${bits_srcdir}/std_fstream.h ${bits_srcdir}/std_functional.h ${bits_srcdir}/std_iomanip.h ${bits_srcdir}/std_ios.h ${bits_srcdir}/std_iosfwd.h ${bits_srcdir}/std_iostream.h ${bits_srcdir}/std_istream.h ${bits_srcdir}/std_iterator.h ${bits_srcdir}/std_limits.h ${bits_srcdir}/std_list.h ${bits_srcdir}/std_locale.h ${bits_srcdir}/std_map.h ${bits_srcdir}/std_memory.h ${bits_srcdir}/std_numeric.h ${bits_srcdir}/std_ostream.h ${bits_srcdir}/std_queue.h ${bits_srcdir}/std_set.h ${bits_srcdir}/std_sstream.h ${bits_srcdir}/std_stack.h ${bits_srcdir}/std_stdexcept.h ${bits_srcdir}/std_streambuf.h ${bits_srcdir}/std_string.h ${bits_srcdir}/std_utility.h ${bits_srcdir}/std_valarray.h ${bits_srcdir}/std_vector.h ${bits_srcdir}/stl_algo.h ${bits_srcdir}/stl_algobase.h ${bits_srcdir}/stl_alloc.h ${bits_srcdir}/stl_bvector.h ${bits_srcdir}/stl_construct.h ${bits_srcdir}/stl_deque.h ${bits_srcdir}/stl_function.h ${bits_srcdir}/stl_heap.h ${bits_srcdir}/stl_iterator.h ${bits_srcdir}/stl_iterator_base_funcs.h ${bits_srcdir}/stl_iterator_base_types.h ${bits_srcdir}/stl_list.h ${bits_srcdir}/stl_map.h ${bits_srcdir}/stl_multimap.h ${bits_srcdir}/stl_multiset.h ${bits_srcdir}/stl_numeric.h ${bits_srcdir}/stl_pair.h ${bits_srcdir}/stl_pthread_alloc.h ${bits_srcdir}/stl_queue.h ${bits_srcdir}/stl_raw_storage_iter.h ${bits_srcdir}/stl_relops.h ${bits_srcdir}/stl_set.h ${bits_srcdir}/stl_stack.h ${bits_srcdir}/stl_tempbuf.h ${bits_srcdir}/stl_threads.h ${bits_srcdir}/stl_tree.h ${bits_srcdir}/stl_uninitialized.h ${bits_srcdir}/stl_vector.h ${bits_srcdir}/streambuf.tcc ${bits_srcdir}/stringfwd.h ${bits_srcdir}/type_traits.h ${bits_srcdir}/valarray_array.h ${bits_srcdir}/valarray_array.tcc ${bits_srcdir}/valarray_meta.h +bits_headers = \ + ${bits_srcdir}/basic_file.h \ + ${bits_srcdir}/basic_ios.h \ + ${bits_srcdir}/basic_ios.tcc \ + ${bits_srcdir}/basic_string.h \ + ${bits_srcdir}/basic_string.tcc \ + ${bits_srcdir}/boost_concept_check.h \ + ${bits_srcdir}/char_traits.h \ + ${bits_srcdir}/codecvt.h \ + ${bits_srcdir}/concept_check.h \ + ${bits_srcdir}/cpp_type_traits.h \ + ${bits_srcdir}/fpos.h \ + ${bits_srcdir}/fstream.tcc \ + ${bits_srcdir}/functexcept.h \ + ${bits_srcdir}/generic_shadow.h \ + ${bits_srcdir}/gslice.h \ + ${bits_srcdir}/gslice_array.h \ + ${bits_srcdir}/indirect_array.h \ + ${bits_srcdir}/ios_base.h \ + ${bits_srcdir}/istream.tcc \ + ${bits_srcdir}/locale_facets.h \ + ${bits_srcdir}/locale_facets.tcc \ + ${bits_srcdir}/localefwd.h \ + ${bits_srcdir}/mask_array.h \ + ${bits_srcdir}/ostream.tcc \ + ${bits_srcdir}/pthread_allocimpl.h \ + ${bits_srcdir}/stream_iterator.h \ + ${bits_srcdir}/streambuf_iterator.h \ + ${bits_srcdir}/slice.h \ + ${bits_srcdir}/slice_array.h \ + ${bits_srcdir}/sstream.tcc \ + ${bits_srcdir}/std_algorithm.h \ + ${bits_srcdir}/std_bitset.h \ + ${bits_srcdir}/std_complex.h \ + ${bits_srcdir}/std_deque.h \ + ${bits_srcdir}/std_fstream.h \ + ${bits_srcdir}/std_functional.h \ + ${bits_srcdir}/std_iomanip.h \ + ${bits_srcdir}/std_ios.h \ + ${bits_srcdir}/std_iosfwd.h \ + ${bits_srcdir}/std_iostream.h \ + ${bits_srcdir}/std_istream.h \ + ${bits_srcdir}/std_iterator.h \ + ${bits_srcdir}/std_limits.h \ + ${bits_srcdir}/std_list.h \ + ${bits_srcdir}/std_locale.h \ + ${bits_srcdir}/std_map.h \ + ${bits_srcdir}/std_memory.h \ + ${bits_srcdir}/std_numeric.h \ + ${bits_srcdir}/std_ostream.h \ + ${bits_srcdir}/std_queue.h \ + ${bits_srcdir}/std_set.h \ + ${bits_srcdir}/std_sstream.h \ + ${bits_srcdir}/std_stack.h \ + ${bits_srcdir}/std_stdexcept.h \ + ${bits_srcdir}/std_streambuf.h \ + ${bits_srcdir}/std_string.h \ + ${bits_srcdir}/std_utility.h \ + ${bits_srcdir}/std_valarray.h \ + ${bits_srcdir}/std_vector.h \ + ${bits_srcdir}/stl_algo.h \ + ${bits_srcdir}/stl_algobase.h \ + ${bits_srcdir}/stl_alloc.h \ + ${bits_srcdir}/stl_bvector.h \ + ${bits_srcdir}/stl_construct.h \ + ${bits_srcdir}/stl_deque.h \ + ${bits_srcdir}/stl_function.h \ + ${bits_srcdir}/stl_heap.h \ + ${bits_srcdir}/stl_iterator.h \ + ${bits_srcdir}/stl_iterator_base_funcs.h \ + ${bits_srcdir}/stl_iterator_base_types.h \ + ${bits_srcdir}/stl_list.h \ + ${bits_srcdir}/stl_map.h \ + ${bits_srcdir}/stl_multimap.h \ + ${bits_srcdir}/stl_multiset.h \ + ${bits_srcdir}/stl_numeric.h \ + ${bits_srcdir}/stl_pair.h \ + ${bits_srcdir}/stl_pthread_alloc.h \ + ${bits_srcdir}/stl_queue.h \ + ${bits_srcdir}/stl_raw_storage_iter.h \ + ${bits_srcdir}/stl_relops.h \ + ${bits_srcdir}/stl_set.h \ + ${bits_srcdir}/stl_stack.h \ + ${bits_srcdir}/stl_tempbuf.h \ + ${bits_srcdir}/stl_threads.h \ + ${bits_srcdir}/stl_tree.h \ + ${bits_srcdir}/stl_uninitialized.h \ + ${bits_srcdir}/stl_vector.h \ + ${bits_srcdir}/streambuf.tcc \ + ${bits_srcdir}/stringfwd.h \ + ${bits_srcdir}/type_traits.h \ + ${bits_srcdir}/valarray_array.h \ + ${bits_srcdir}/valarray_array.tcc \ + ${bits_srcdir}/valarray_meta.h backward_srcdir = ${glibcpp_srcdir}/include/backward backward_builddir = ./backward -backward_headers = ${backward_srcdir}/complex.h ${backward_srcdir}/iomanip.h ${backward_srcdir}/istream.h ${backward_srcdir}/ostream.h ${backward_srcdir}/stream.h ${backward_srcdir}/streambuf.h ${backward_srcdir}/algo.h ${backward_srcdir}/algobase.h ${backward_srcdir}/alloc.h ${backward_srcdir}/bvector.h ${backward_srcdir}/defalloc.h ${backward_srcdir}/deque.h ${backward_srcdir}/function.h ${backward_srcdir}/hash_map.h ${backward_srcdir}/hash_set.h ${backward_srcdir}/hashtable.h ${backward_srcdir}/heap.h ${backward_srcdir}/iostream.h ${backward_srcdir}/iterator.h ${backward_srcdir}/list.h ${backward_srcdir}/map.h ${backward_srcdir}/multimap.h ${backward_srcdir}/new.h ${backward_srcdir}/multiset.h ${backward_srcdir}/pair.h ${backward_srcdir}/queue.h ${backward_srcdir}/rope.h ${backward_srcdir}/set.h ${backward_srcdir}/slist.h ${backward_srcdir}/stack.h ${backward_srcdir}/tempbuf.h ${backward_srcdir}/tree.h ${backward_srcdir}/vector.h ${backward_srcdir}/fstream.h ${backward_srcdir}/strstream.h ${backward_srcdir}/strstream ${backward_srcdir}/backward_warning.h +backward_headers = \ + ${backward_srcdir}/complex.h \ + ${backward_srcdir}/iomanip.h \ + ${backward_srcdir}/istream.h \ + ${backward_srcdir}/ostream.h \ + ${backward_srcdir}/stream.h \ + ${backward_srcdir}/streambuf.h \ + ${backward_srcdir}/algo.h \ + ${backward_srcdir}/algobase.h \ + ${backward_srcdir}/alloc.h \ + ${backward_srcdir}/bvector.h \ + ${backward_srcdir}/defalloc.h \ + ${backward_srcdir}/deque.h \ + ${backward_srcdir}/function.h \ + ${backward_srcdir}/hash_map.h \ + ${backward_srcdir}/hash_set.h \ + ${backward_srcdir}/hashtable.h \ + ${backward_srcdir}/heap.h \ + ${backward_srcdir}/iostream.h \ + ${backward_srcdir}/iterator.h \ + ${backward_srcdir}/list.h \ + ${backward_srcdir}/map.h \ + ${backward_srcdir}/multimap.h \ + ${backward_srcdir}/new.h \ + ${backward_srcdir}/multiset.h \ + ${backward_srcdir}/pair.h \ + ${backward_srcdir}/queue.h \ + ${backward_srcdir}/rope.h \ + ${backward_srcdir}/set.h \ + ${backward_srcdir}/slist.h \ + ${backward_srcdir}/stack.h \ + ${backward_srcdir}/tempbuf.h \ + ${backward_srcdir}/tree.h \ + ${backward_srcdir}/vector.h \ + ${backward_srcdir}/fstream.h \ + ${backward_srcdir}/strstream.h \ + ${backward_srcdir}/strstream \ + ${backward_srcdir}/backward_warning.h ext_srcdir = ${glibcpp_srcdir}/include/ext ext_builddir = ./ext -ext_headers = ${ext_srcdir}/rope ${ext_srcdir}/ropeimpl.h ${ext_srcdir}/stl_rope.h ${ext_srcdir}/slist ${ext_srcdir}/hash_map ${ext_srcdir}/hash_set ${ext_srcdir}/stl_hashtable.h ${ext_srcdir}/stl_hash_fun.h +ext_headers = \ + ${ext_srcdir}/rope \ + ${ext_srcdir}/ropeimpl.h \ + ${ext_srcdir}/stl_rope.h \ + ${ext_srcdir}/slist \ + ${ext_srcdir}/hash_map \ + ${ext_srcdir}/hash_set \ + ${ext_srcdir}/stl_hashtable.h \ + ${ext_srcdir}/stl_hash_fun.h # This is the common subset of files that all three "C" header models use. c_base_srcdir = @C_INCLUDE_DIR@/bits c_base_builddir = ./bits -c_base_headers = ${c_base_srcdir}/std_cassert.h ${c_base_srcdir}/std_cctype.h ${c_base_srcdir}/std_cerrno.h ${c_base_srcdir}/std_cfloat.h ${c_base_srcdir}/std_climits.h ${c_base_srcdir}/std_clocale.h ${c_base_srcdir}/std_cmath.h ${c_base_srcdir}/std_csetjmp.h ${c_base_srcdir}/std_csignal.h ${c_base_srcdir}/std_cstdarg.h ${c_base_srcdir}/std_cstddef.h ${c_base_srcdir}/std_cstdio.h ${c_base_srcdir}/std_cstdlib.h ${c_base_srcdir}/std_cstring.h ${c_base_srcdir}/std_ctime.h ${c_base_srcdir}/std_cwchar.h ${c_base_srcdir}/std_cwctype.h ${c_base_srcdir}/cmath.tcc +c_base_headers = \ + ${c_base_srcdir}/std_cassert.h \ + ${c_base_srcdir}/std_cctype.h \ + ${c_base_srcdir}/std_cerrno.h \ + ${c_base_srcdir}/std_cfloat.h \ + ${c_base_srcdir}/std_climits.h \ + ${c_base_srcdir}/std_clocale.h \ + ${c_base_srcdir}/std_cmath.h \ + ${c_base_srcdir}/std_csetjmp.h \ + ${c_base_srcdir}/std_csignal.h \ + ${c_base_srcdir}/std_cstdarg.h \ + ${c_base_srcdir}/std_cstddef.h \ + ${c_base_srcdir}/std_cstdio.h \ + ${c_base_srcdir}/std_cstdlib.h \ + ${c_base_srcdir}/std_cstring.h \ + ${c_base_srcdir}/std_ctime.h \ + ${c_base_srcdir}/std_cwchar.h \ + ${c_base_srcdir}/std_cwctype.h \ + ${c_base_srcdir}/cmath.tcc std_srcdir = ${glibcpp_srcdir}/include/std std_builddir = ./ -std_headers = ${std_srcdir}/algorithm ${std_srcdir}/bitset ${std_srcdir}/complex ${std_srcdir}/deque ${std_srcdir}/fstream ${std_srcdir}/functional ${std_srcdir}/iomanip ${std_srcdir}/ios ${std_srcdir}/iosfwd ${std_srcdir}/iostream ${std_srcdir}/istream ${std_srcdir}/iterator ${std_srcdir}/limits ${std_srcdir}/list ${std_srcdir}/locale ${std_srcdir}/map ${std_srcdir}/memory ${std_srcdir}/numeric ${std_srcdir}/ostream ${std_srcdir}/queue ${std_srcdir}/set ${std_srcdir}/sstream ${std_srcdir}/stack ${std_srcdir}/stdexcept ${std_srcdir}/streambuf ${std_srcdir}/string ${std_srcdir}/utility ${std_srcdir}/valarray ${std_srcdir}/vector ${std_srcdir}/cassert ${std_srcdir}/cctype ${std_srcdir}/cerrno ${std_srcdir}/cfloat ${std_srcdir}/climits ${std_srcdir}/clocale ${std_srcdir}/ciso646 ${std_srcdir}/cmath ${std_srcdir}/csetjmp ${std_srcdir}/csignal ${std_srcdir}/cstdarg ${std_srcdir}/cstddef ${std_srcdir}/cstdio ${std_srcdir}/cstdlib ${std_srcdir}/cstring ${std_srcdir}/ctime ${std_srcdir}/cwchar ${std_srcdir}/cwctype +std_headers = \ + ${std_srcdir}/algorithm \ + ${std_srcdir}/bitset \ + ${std_srcdir}/complex \ + ${std_srcdir}/deque \ + ${std_srcdir}/fstream \ + ${std_srcdir}/functional \ + ${std_srcdir}/iomanip \ + ${std_srcdir}/ios \ + ${std_srcdir}/iosfwd \ + ${std_srcdir}/iostream \ + ${std_srcdir}/istream \ + ${std_srcdir}/iterator \ + ${std_srcdir}/limits \ + ${std_srcdir}/list \ + ${std_srcdir}/locale \ + ${std_srcdir}/map \ + ${std_srcdir}/memory \ + ${std_srcdir}/numeric \ + ${std_srcdir}/ostream \ + ${std_srcdir}/queue \ + ${std_srcdir}/set \ + ${std_srcdir}/sstream \ + ${std_srcdir}/stack \ + ${std_srcdir}/stdexcept \ + ${std_srcdir}/streambuf \ + ${std_srcdir}/string \ + ${std_srcdir}/utility \ + ${std_srcdir}/valarray \ + ${std_srcdir}/vector \ + ${std_srcdir}/cassert \ + ${std_srcdir}/cctype \ + ${std_srcdir}/cerrno \ + ${std_srcdir}/cfloat \ + ${std_srcdir}/climits \ + ${std_srcdir}/clocale \ + ${std_srcdir}/ciso646 \ + ${std_srcdir}/cmath \ + ${std_srcdir}/csetjmp \ + ${std_srcdir}/csignal \ + ${std_srcdir}/cstdarg \ + ${std_srcdir}/cstddef \ + ${std_srcdir}/cstdio \ + ${std_srcdir}/cstdlib \ + ${std_srcdir}/cstring \ + ${std_srcdir}/ctime \ + ${std_srcdir}/cwchar \ + ${std_srcdir}/cwctype target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@ target_builddir = ./${target_alias}/bits -target_headers = ${target_srcdir}/ctype_base.h ${target_srcdir}/ctype_inline.h ${target_srcdir}/ctype_noninline.h ${target_srcdir}/os_defines.h ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h ${glibcpp_srcdir}/@LIMITS_INC_SRCDIR@/limits.h +target_headers = \ + ${target_srcdir}/ctype_base.h \ + ${target_srcdir}/ctype_inline.h \ + ${target_srcdir}/ctype_noninline.h \ + ${target_srcdir}/os_defines.h \ + ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ + ${glibcpp_srcdir}/@LIMITS_INC_SRCDIR@/limits.h thread_builddir = ./${target_alias}/bits -thread_headers = ${thread_builddir}/gthr.h ${thread_builddir}/gthr-single.h ${thread_builddir}/gthr-default.h +thread_headers = \ + ${thread_builddir}/gthr.h \ + ${thread_builddir}/gthr-single.h \ + ${thread_builddir}/gthr-default.h # List of all timestamp files. By keeping only one copy of this list, both # CLEANFILES and all-local are kept up-to-date. -allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext stamp-target stamp-thread +allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \ + stamp-target stamp-thread # Target includes for threads diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index f0f84eac1e1..55b3bc7cc27 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -151,7 +151,7 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = 1.3 cygnus mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la +@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES @@ -159,14 +159,20 @@ GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ -INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = \ + -nostdinc++ \ + $(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) -libio_headers = libio.h libioP.h iolibio.h +libio_headers = \ + libio.h libioP.h iolibio.h -@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c +@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\ +@GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \ +@GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = -@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c +@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\ +@GLIBCPP_NEED_WLIBIO_TRUE@ wfiledoalloc.c wfileops.c wgenops.c iofwide.c @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = EXTRA_DIST = iostreamP.h diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 7b5f89b10ef..368a449a50b 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -160,7 +160,9 @@ EXTRA_LONG_DOUBLE_yes = signbitl.c EXTRA_DIST = $(EXTRA_LONG_DOUBLE_yes) -libmath_la_LIBADD = @LIBMATHOBJS@ $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) +libmath_la_LIBADD = \ + @LIBMATHOBJS@ \ + $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) @@ -172,7 +174,8 @@ LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -INCLUDES = $(TOPLEVEL_INCLUDES) +INCLUDES = \ + $(TOPLEVEL_INCLUDES) CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 80d4fcbb9ab..e1e9ec20c23 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -171,24 +171,50 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. -CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ +CONFIG_CXXFLAGS = \ + @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. -WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once +WARN_CXXFLAGS = \ + @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) - - -headers = exception new typeinfo cxxabi.h exception_defines.h - - -sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc +INCLUDES = \ + -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include \ + $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) + + +headers = \ + exception new typeinfo cxxabi.h exception_defines.h + + +sources = \ + del_op.cc \ + del_opnt.cc \ + del_opv.cc \ + del_opvnt.cc \ + eh_alloc.cc \ + eh_aux_runtime.cc \ + eh_catch.cc \ + eh_exception.cc \ + eh_globals.cc \ + eh_personality.cc \ + eh_terminate.cc \ + eh_throw.cc \ + new_handler.cc \ + new_op.cc \ + new_opnt.cc \ + new_opv.cc \ + new_opvnt.cc \ + pure.cc \ + tinfo.cc \ + tinfo2.cc \ + vec.cc libsupc___la_SOURCES = $(sources) @@ -204,7 +230,12 @@ LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS) # set this option because CONFIG_CXXFLAGS has to be after # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # as the occasion call for it. (ie, --enable-debug) -AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) +AM_CXXFLAGS = \ + -fno-implicit-templates \ + $(LIBSUPCXX_CXXFLAGS) \ + $(WARN_CXXFLAGS) \ + $(OPTIMIZE_CXXFLAGS) \ + $(CONFIG_CXXFLAGS) # libstdc++ libtool notes @@ -228,7 +259,9 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) # # We have to put --tag disable-shared after --tag CXX lest things # CXX undo the affect of disable-shared. -LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ + --mode=compile $(CXX) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if @@ -237,7 +270,9 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=c # course is problematic at this point. So, we get the top-level # directory to configure libstdc++-v3 to use gcc as the C++ # compilation driver. -CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared --mode=link $(CXX) @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \ + --mode=link $(CXX) \ + @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 171a00c3272..dc10400e1c3 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -164,7 +164,9 @@ LOCALE_OUT = @glibcpp_MOFILES@ MSGFMT = msgfmt # Necessary files. -DISTFILES = Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN) +DISTFILES = \ + Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \ + $(LOCALE_IN) # Specify what gets cleaned up on a 'make clean' diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index edea4108471..dd2b3b8a51f 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -161,11 +161,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # These bits are all figured out from configure. Look in acinclude.m4 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. -CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ +CONFIG_CXXFLAGS = \ + @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. -WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once +WARN_CXXFLAGS = \ + @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES @@ -175,17 +177,29 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = \ + -nostdinc++ \ + $(GLIBCPP_INCLUDES) \ + $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \ + $(TOPLEVEL_INCLUDES) -sources = basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc complex_io.cc functexcept.cc globals.cc ios.cc limits.cc locale.cc locale-inst.cc localename.cc collate.cc messages.cc moneypunct.cc numpunct.cc misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc valarray-inst.cc wstring-inst.cc +sources = \ + basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc \ + complex_io.cc functexcept.cc globals.cc ios.cc limits.cc \ + locale.cc locale-inst.cc localename.cc \ + collate.cc messages.cc moneypunct.cc numpunct.cc \ + misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc \ + valarray-inst.cc wstring-inst.cc VPATH = $(top_srcdir):$(top_srcdir)/src libstdc___la_SOURCES = $(sources) -libstdc___la_LIBADD = ../libmath/libmath.la @libio_la@ ../libsupc++/libsupc++convenience.la +libstdc___la_LIBADD = \ + ../libmath/libmath.la @libio_la@ \ + ../libsupc++/libsupc++convenience.la libstdc___la_LDFLAGS = -version-info @libtool_VERSION@ -lm @@ -205,7 +219,12 @@ GLIBCPP_INCLUDE_DIR = @glibcpp_builddir@/include # The no-implicit-templates flag will generate unresolved references to # the concept-checking symbols. So we must disable the checks while # actually building the library. -AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) +AM_CXXFLAGS = \ + -fno-implicit-templates \ + $(LIBSUPCXX_CXXFLAGS) \ + $(WARN_CXXFLAGS) \ + $(OPTIMIZE_CXXFLAGS) \ + $(CONFIG_CXXFLAGS) # libstdc++ libtool notes @@ -226,7 +245,8 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # attempt to infer which configuration to use -LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if @@ -235,7 +255,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $( # course is problematic at this point. So, we get the top-level # directory to configure libstdc++-v3 to use gcc as the C++ # compilation driver. -CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ + @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libstdc++-v3/src/stl-inst.cc b/libstdc++-v3/src/stl-inst.cc index 2dfc2537804..2bf74ecab1b 100644 --- a/libstdc++-v3/src/stl-inst.cc +++ b/libstdc++-v3/src/stl-inst.cc @@ -50,27 +50,5 @@ namespace std vector<unsigned int>:: _M_insert_aux(vector<unsigned int>::iterator, unsigned int const &); -#ifdef _GLIBCPP_CONCEPT_CHECKS - template - void __sink_unused_warning<unsigned int>(unsigned int); - - template - void __sink_unused_warning<locale::facet*>(locale::facet*); +} // namespace std - template - void __sink_unused_warning<char>(char); - - template - void __sink_unused_warning<ostreambuf_iterator<char> > - (ostreambuf_iterator<char>); - -# ifdef _GLIBCPP_USE_WCHAR_T - template - void __sink_unused_warning<wchar_t>(wchar_t); - - template - void __sink_unused_warning<ostreambuf_iterator<wchar_t> > - (ostreambuf_iterator<wchar_t>); -# endif -#endif -} //std diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 04867cbecd0..1dff6d209d6 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -155,10 +155,14 @@ AUTOMAKE_OPTIONS = foreign dejagnu DEJATOOL = libstdc++-v3 -EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then echo @glibcpp_builddir@/../../expect/expect ; else echo expect ; fi` +EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \ + echo @glibcpp_builddir@/../../expect/expect ; \ + else echo expect ; fi` -RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then echo @glibcpp_srcdir@/../dejagnu/runtest ; else echo runtest; fi` +RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \ + echo @glibcpp_srcdir@/../dejagnu/runtest ; \ + else echo runtest; fi` RUNTESTFLAGS = diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in index 335e08585cd..04a2c29f444 100755 --- a/libstdc++-v3/testsuite_flags.in +++ b/libstdc++-v3/testsuite_flags.in @@ -28,14 +28,14 @@ query=$1 case ${query} in --install-includes) - INCLUDES="-I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite" + INCLUDES="-I${SRC_DIR}/testsuite" echo ${INCLUDES} ;; --build-includes) INCLUDES="-nostdinc++ @GLIBCPP_INCLUDES@ -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio -I${SRC_DIR}/include/backward - -I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite" + -I${SRC_DIR}/testsuite" echo ${INCLUDES} ;; --install-cxx) |