diff options
Diffstat (limited to 'libstdc++-v3')
22 files changed, 345 insertions, 775 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e40e1f6d77e..b1b7be01abf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2012-08-02 Michael Hope <michael.hope@linaro.org> + + Backport from mainline r186389: + 2012-04-12 Andreas Schwab <schwab@linux-m68k.org> + + * testsuite/Makefile.am (check_DEJAGNUnormal0): Run + prettyprinters.exp. + * testsuite/Makefile.in: Regenerated. + 2012-07-29 François Dumont <fdumont@gcc.gnu.org> PR libstdc++/54075 @@ -117,310 +126,25 @@ 2012-06-19 Jonathan Wakely <jwakely.gcc@gmail.com> - * GCC 4.3.6 released. - -2010-05-22 Release Manager - - * GCC 4.3.5 released. - -2010-05-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - - PR other/43620 - * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. - * configure: Regenerate. - * Makefile.in: Regenerate. - * doc/Makefile.in: Regenerate. - * include/Makefile.in: Regenerate. - * libmath/Makefile.in: Regenerate. - * libsupc++/Makefile.in: Regenerate. - * po/Makefile.in: Regenerate. - * src/Makefile.in: Regenerate. - * testsuite/Makefile.in: Regenerate. - -2010-04-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> - - PR target/43458 - * testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc: - Xfail hppa*-*-hpux*. - -2010-02-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> - - Backport: - 2010-01-20 Janis Johnson <janis187@us.ibm.com> - Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/21769 - * testsuite/lib/dg-options.exp (add_options_for_no_pch): Add. - * testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc: - Use it. - -2009-08-04 Release Manager - - * GCC 4.3.4 released. - -2009-03-14 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/39405 - * include/std/type_traits (__add_lvalue_reference_helper, - __add_rvalue_reference_helper): Avoid is_function. - * testsuite/20_util/shared_ptr/cons/39405.cc: New. - * testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc: Likewise. - -2009-02-09 Johannes Singler <singler@ira.uka.de> - - Backport from mainline: - 2009-02-03 Johannes Singler <singler@ira.uka.de> - - * include/parallel/algorithmfwd.h: - Add parallelism default for many declarations. - * include/parallel/numericfwd.h: Likewise. - * include/parallel/iterator.h: Use iterator_traits as usual. - * include/parallel/par_loop.h: - Include equally_split.h. - (for_each_template_random_access_ed): - Avoid calling the Result default constructor. - * include/parallel/numeric: Replace - for_each_template_random_access by - for_each_template_random_access_ed in numeric functions. - -2009-01-27 Uros Bizjak <ubizjak@gmail.com> - - Backport from mainline: - 2009-01-13 Uros Bizjak <ubizjak@gmail.com> - - * scripts/extract_symvers: Add sed script to remove ' [<other>: xx] ' - field from readelf output. - -2009-01-24 Release Manager - - * GCC 4.3.3 released. - -2009-01-12 Benjamin Kosnik <bkoz@redhat.com> - Jonathan Larmour <jifl@eCosCentric.com> - - PR libstdc++/36801 - * config/cpu/generic/atomicity_mutex/atomicity.h (get_atomic_mutex): - New. - (__gnu_cxx::__exchange_and_add): Use it. - * src/debug.cc (get_safe_base_mutex): New. - * src/locale.cc (get_locale_cache_mutex): New. - * src/mt_allocator.cc (get_freelist): New. - (get_freelist_mutex): New. - * src/pool_allocator.cc (get_palloc_mutex): New. - -2009-01-12 Jonathan Larmour <jifl@eCosCentric.com> - - * include/ext/concurrence.h: Fix __gthread_cond_t initialisation - function macro name. - -2009-01-08 Paolo Carlini <paolo.carlini@oracle.com> - - Backport from mainline: - 2008-11-13 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/38000 - * include/c_global/csignal: Do not use include_next. - * include/c_global/cstdlib: Likewise. - * include/c_global/cstdio: Likewise. - * include/c_global/cstdarg: Likewise. - * include/c_global/cctype: Likewise. - * include/c_global/cerrno: Likewise. - * include/c_global/cmath: Likewise. - * include/c_global/clocale: Likewise. - * include/c_global/climits: Likewise. - * include/c_global/cassert: Likewise. - * include/c_global/csetjmp: Likewise. - * include/c_global/cwchar: Likewise. - * include/c_global/cfloat: Likewise. - * include/c_global/cstdbool: Likewise. - * include/c_global/cstring: Likewise. - * include/c_global/cstddef: Likewise. - * include/c_global/cwctype: Likewise. - * include/tr1/cstdbool: Likewise. - * include/tr1_impl/cinttypes: Do not include <inttypes.h>. - * include/c_global/cinttypes: Do it here. - * include/tr1/cinttypes: Likewise. - * include/tr1_impl/cfenv: Do not include <fenv.h>. - * include/c_global/cfenv: Do it here. - * include/tr1/cfenv: Likewise. - * include/tr1_impl/cstdint: Do not include <stdint.h>. - * include/c_global/cstdint: Do it here. - * include/tr1/cstdint: Likewise. - * include/c_compatibility/fenv.h: Include <tr1_impl/cfenv>. - * include/c_compatibility/stdint.h: Include <tr1_impl/cstdint>. - * include/c_compatibility/inttypes.h: Include <tr1_impl/cinttypes>. - - * include/c_compatibility/math.h: Minor tweak, add comment. - -2008-12-12 H.J. Lu <hongjiu.lu@intel.com> - - Backport from mainline: - 2008-12-12 H.J. Lu <hongjiu.lu@intel.com> - - PR libstdc++/37144 - * testsuite/util/regression/trait/assoc/type_trait.hpp - (regression_test_type_traits): Add const to pair_type_rebind. - -2008-12-11 Jakub Jelinek <jakub@redhat.com> - - PR c++/37582 - * include/bits/cpp_type_traits.h (struct __traitand): New. - * include/c_global/cmath (std::atan2, std::pow): Use __traitand - instead of && as first argument to __enable_if. - * include/c_std/cmath (std::atan2): Likewise. - * testsuite/26_numerics/headers/cmath/37582.cc: New. - -2008-12-04 Janis Johnson <janis187@us.ibm.com> - - Backport from mainline: - 2008-10-18 Jakub Jelinek <jakub@redhat.com> - Janis Johnson <janis187@us.ibm.com> - - * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Remove dejagnu. - (RUNTESTDEFAULTFLAGS, EXPECT, check_DEJAGNU_normal_targets): New - variables. - (%/site.exp, check-DEJAGNU%): New targets. - (check-am): Run $(MAKE) check-DEJAGNU. - * testsuite/Makefile.in: Regenerated. - -2008-12-02 Janis Johnson <janis187@us.ibm.com> - - Backport from mainline: - 2008-11-26 Janis Johnson <janis187@us.ibm.com> - - PR testsuite/28870 - * testsuite/lib/libstdc++.exp: Include new timeout library files. - (libstdc++_init): Define tool_timeout. - (dg-test): Override DejaGnu proc. - (v3_target_compile): Set timeout value from new proc. - (v3_target_compile_as_c): Ditto. - -2008-12-01 Benjamin Kosnik <bkoz@redhat.com> - - PR libstdc++/38080 - * include/std/iostream: Correct URL. - * include/std/streambuf: Same. - * include/std/bitset: Same. - * include/std/iosfwd: Same. - * include/std/fstream: Same. - * include/std/istream: Same. - * include/std/ostream: Same. - * include/std/sstream: Same. - * include/bits/basic_ios.h: Same. - * include/bits/stl_map.h: Same. - * include/bits/stl_set.h: Same. - * include/bits/stl_multimap.h: Same. - * include/bits/ios_base.h: Same. - * include/bits/stl_multiset.h: Same. - * include/bits/char_traits.h: Same. - * include/bits/stl_relops.h: Same. - * testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust line numbers. - * testsuite/27_io/ios_base/cons/copy_neg.cc: Ditto. - -2008-08-27 Release Manager - - * GCC 4.3.2 released. - -2008-08-12 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/37100 - * include/bits/stl_pair.h: Fix documentation URL in comment. - -2008-08-12 Johannes Singler <singler@ira.uka.de> - - * include/paralle/losertree.h - (LoserTreePointerBase<>::~LoserTreePointerBase): - Replace delete by appropriate delete[]. - -2008-07-15 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/36832 - * include/ext/rope (_Destroy_const): Add. - (rope<>::copy): Call it. - * testsuite/ext/rope/36832.cc: New. - -2008-07-10 Johannes Singler <singler@ira.uka.de> - - * include/parallel/balanced_quicksort.h: - (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. - -2008-07-09 Andreas Beckmann <gcc@abeckmann.de> - - PR libstdc++/36552 - * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ - null_metadata.hpp: Remove self-include. - -2008-07-09 Johannes Singler <singler@ira.uka.de> - - PR libstdc++/36729 - * include/parallel/random_shuffle.h: - (sequential_random_shuffle) Copy data back. - * testsuite/25_algorithms/random_shuffle/1.cc: - New. Generic random_shuffle functionality test. - -2008-07-07 Bernd Schmidt <bernd.schmidt@analog.com> - - * configure.ac: Don't check AC_LIBTOOL_DLOPEN if using newlib. - * configure: Regenerate. - -2008-07-04 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/36616 - * testsuite/22_locale/time_put/put/char/4.cc: Just use es_ES instead. - * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. - -2008-06-30 Alfred E. Heggestad <aeh@db.org> - - * include/backward/backward_warning.h: Fix typo. - -2008-06-26 Paolo Carlini <paolo.carlini@oracle.com> - - * include/parallel/base.h (plus, multiplies): Use __typeof__, - not typeof. - -2008-06-24 Paolo Carlini <paolo.carlini@oracle.com> - - * include/bits/stl_algo.h (remove_if): Cast __pred result to bool. - -2008-06-24 Paolo Carlini <paolo.carlini@oracle.com> - - PR libstdc++/36616 - * testsuite/22_locale/money_put/put/char/9780-3.cc: Fix expected - results for recent glibcs (2.8 and later). - * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. - * testsuite/22_locale/time_put/put/char/4.cc: Likewise. - -2008-06-24 Paolo Carlini <paolo.carlini@oracle.com> - Chalathip Thumkanon <chalathip@gmail.com> - - PR libstdc++/36612 - * include/ext/pb_ds/exception.hpp (__throw_container_error, - __throw_insert_error, __throw_join_error, __throw_resize_error): - Mark inline. - -2008-06-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - - * include/Makefile.am: Remove trailing white space, fix typo. - (parallel_headers): Remove duplicate file, sort entries. - * include/Makefile.in: Regenerate. + PR libstdc++/53270 + * config/os/gnu-linux/os_defines.h: Disable static initializer macros + for gthreads types in C++11 mode. -2008-06-06 Release Manager +2012-06-19 Jörg Sonnenberger <joerg@britannica.bec.de> + Jonathan Wakely <jwakely.gcc@gmail.com> - * GCC 4.3.1 released. + PR libstdc++/53678 + * config/os/bsd/netbsd/ctype_base.h: Check for _CTYPE_U. + * testsuite/22_locale/ctype_base/53678.cc: New. -2008-06-05 Johannes Singler <singler@ira.uka.de> +2012-06-14 Release Manager - * include/parallel/random_shuffle.h: - (parallel_random_shuffle_drs) Get the actual number of - threads after entering the parallel region. Indentation. - * include/parallel/algo.h: (random_shuffle(begin, end)) - Add namespace qualification to avoid ambiguity. + * GCC 4.7.1 released. -2008-05-15 Johannes Singler <singler@ira.uka.de> +2012-05-28 Paolo Carlini <paolo.carlini@oracle.com> - * doc/xml/manual/parallel_mode.xml: - General revision, correct wrong doc and make it more - readable. + PR c++/53503 + * testsuite/26_numerics/headers/cmath/53503.cc: New. 2012-05-10 DJ Delorie <dj@redhat.com> @@ -444,27 +168,19 @@ * testsuite/23_containers/unordered_multiset/insert/53115.cc: New. * testsuite/23_containers/unordered_multimap/insert/53115.cc: New. - * include/parallel/quicksort.h (parallel_sort_qs_conquer): - Explicitly request number of threads in the parallel clause. - (parallel_sort_qs): Remove setting the number of threads globally. +2012-04-30 Andreas Tobler <andreast@fgznet.ch> Backport from mainline 2012-03-21 Andreas Tobler <andreast@fgznet.ch> - * include/parallel/multiway_merge.h (multiway_merge_*_unguarded): - Pass sentinel directly, to allow correct determination. - (multiway_merge_loser_tree_unguarded): Remove over-cautious assertion. - (calls to multiway_merge_*_splitting): Parametrize with type that - is correct in all cases. - * include/parallel/losertree.h (delete_min_insert (in many classes)): - Correct and standardize assertions. + * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: + Skip this test on powerpc64-*-freebsd*. 2012-04-25 Jonathan Wakely <jwakely.gcc@gmail.com> - * 20_util/make_signed/requirements/typedefs-1.cc: Correct requirements. - * 20_util/make_unsigned/requirements/typedefs-1.cc: Same. - -2008-04-29 Benjamin Kosnik <bkoz@redhat.com> + * include/std/scoped_allocator (scoped_allocator::__outermost): Do + not pass non-POD to varargs function. + * testsuite/20_util/scoped_allocator/1.cc: Fix test. 2012-04-23 Chris Jefferson <chris@bubblescope.net> @@ -487,22 +203,12 @@ * testsuite/20_util/pointer_traits/requirements/typedefs.cc: Check rebind works. - Revert PR libstdc++/35887 - * configure.ac: Revert. - * acinclude.m4: Same. - * configure: Regenerate. - * include/Makefile.am: Revert. - * include/Makefile.in: Regenerate. - -2008-04-24 Benjamin Kosnik <bkoz@redhat.com> +2012-04-21 Alan Modra <amodra@gmail.com> - PR libstdc++/35887 - * configure.ac: Add default argument to GLIBCXX_ENABLE_PARALLEL. - * acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Check for --disable-libgomp. + PR libstdc++/52839 + * acinclude.m4 (_GLIBCXX_ATOMIC_BUILTINS): Do not depend on + glibcxx_cv_atomic_long_long. * configure: Regenerate. - * include/Makefile.am (parallel_headers): Make conditional on - ENABLE_PARALLEL. - * include/Makefile.in: Regenerate. 2012-04-16 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> @@ -513,20 +219,24 @@ 2012-04-16 Benjamin Kosnik <bkoz@redhat.com> - * include/parallel/multiway_merge.h - (multiway_merge_loser_tree): - Leave checks to callers, add precondition instead. - (multiway_merge_loser_tree_unguarded): Likewise. - (multiway_merge_loser_tree_sentinel): Likewise. - (sequential_multiway_merge): Added checks for total length 0. - (parallel_multiway_merge): Skip empty sequences. - (multiway_merge, all variants): - Remove temporary variable, return directly. - (stable_multiway_merge, all variants): Likewise. - (multiway_merge_sentinels, all variants): Likewise. - (stable_multiway_merge_sentinels, all variants): Likewise. - * include/parallel/multiseq_selection.h - (multiseq_partition): More detailed assertions. + PR libstdc++/52689 + * libsupc++/Makefile.am (LTCXXCOMPILE, CXXLINK): Tweak. + * libsupc++/Makefile.in: Regenerated. + * src/Makefile.am (LTCXXCOMPILE, CXXLINK): Tweak. + (libstdc___la_SOURCES): Add in compatiblity files, with content + that varies with -DPIC. + * src/Makefile.in: Regenerated. + * src/c++11/Makefile.am (LTCXXCOMPILE, CXXLINK): Tweak. + * src/c++11/Makefile.in: Regenerated. + * src/c++11/compatibility-atomic-c++0x.cc: Guard with PIC. + * src/c++11/compatibility-c++0x.cc: Same. + * src/c++11/future.cc: Consolidate compatibility bits into.. + * src/c++11/mutex.cc: Consolidate compatibility bits into.. + * src/c++11/compatibility-thread-cxx0x.cc: ...here. New. + * src/c++98/Makefile.am (LTCXXCOMPILE, CXXLINK): Tweak. + * src/c++98/Makefile.in: Regenerated. + * src/c++98/compatibility-list-2.cc: Guard with PIC. + * src/c++98/compatibility.cc: Tweak comments. 2012-04-16 Benjamin Kosnik <bkoz@redhat.com> @@ -537,9 +247,11 @@ 2012-04-14 Paolo Carlini <paolo.carlini@oracle.com> - * doc/html/*: Regenerate. - -2008-04-10 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + PR libstdc++/52699 + * include/bits/random.tcc (independent_bits_engine<>::operator()()) + Avoid various overflows; use common_type on result_type and + _RandomNumberEngine::result_type; avoid floating point computations; + other smaller tweaks. * include/bits/random.tcc (uniform_int_distribution<>::operator()) Use common_type; assume _UniformRandomNumberGenerator::result_type @@ -548,10 +260,7 @@ * include/bits/stl_algobase.h (__lg(unsigned), __lg(unsigned long), __lg(unsigned long long)): Add. - * doc/xml/manual/parallel_mode.xml: Remove map/set bulk - insertors. Correct omp_set_num_threads example. - -2008-04-07 Johannes Singler <singler@ira.uka.de> +2012-04-13 Paolo Carlini <paolo.carlini@oracle.com> * include/debug/safe_iterator.h (_BeforeBeginHelper<>:: _S_Is_Beginnest): Add. @@ -600,65 +309,24 @@ * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Likewise. - * doc/xml/api.xml: Add gcc-4.3 links. - * doc/html/api.html: Regenerate. - - * include/debug/debug.h: Document namepaces here. - * include/parallel/base.h: Same. - * include/ext/typelist.h: Same. - * include/ext/pb_ds/tag_and_trait.hpp: Same. - - * include/tr1_impl/random: Adjust line break. - * include/tr1_impl/unordered_map: Correct and or add markup. - * include/tr1_impl/boost_shared_ptr.h: Correct and or add markup. - * include/tr1_impl/functional_hash.h: Same. - * include/tr1_impl/cmath: Same. - * include/tr1_impl/functional: Same. - * include/tr1_impl/unordered_set: Same. - * include/tr1_impl/complex: Same. - * include/tr1_impl/type_traits: Same. - * include/tr1_impl/regex: Same. - * include/tr1_impl/array: Same. - * include/std/tuple: Same. - * include/std/date_time: Same. - * include/std/system_error: Same. - * include/std/type_traits: Same. - * include/ext/enc_filebuf.h: Same. - * include/ext/throw_allocator.h: Same. - * include/ext/pool_allocator.h: Same. - * include/ext/bitmap_allocator.h: Same. - * include/ext/concurrence.h: Same. - * include/ext/codecvt_specializations.h: Same. - * include/ext/stdio_sync_filebuf.h: Same. - * include/ext/array_allocator.h: Same. - * include/ext/mt_allocator.h: Same. - * include/bits/locale_classes.h: Same. - * include/bits/locale_facets.h: Same. - * include/bits/codecvt.h: Same. - * include/bits/char_traits.h: Same. - * include/bits/allocator.h: Same. - * include/bits/locale_facets_nonio.h: Same. - * include/tr1/poly_laguerre.tcc: Same. - * include/tr1/riemann_zeta.tcc: Same. - * include/tr1/beta_function.tcc: Same. - * include/tr1/tuple: Same. - * include/tr1/exp_integral.tcc: Same. - * include/tr1/gamma.tcc: Same. - * include/tr1/hypergeometric.tcc: Same. - * include/tr1/modified_bessel_func.tcc: Same. - * include/tr1/legendre_function.tcc: Same. - * include/tr1/type_traits: Same. - * include/tr1/special_function_util.h: Same. - * include/tr1/bessel_function.tcc: Same. - * include/tr1/cmath: Same. - * include/tr1/poly_hermite.tcc: Same. - * include/tr1/ell_integral.tcc: Same. - * config/abi/compatibility.h: Adjust file name. - - * testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Adjust - line numbers. - * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. - * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. +2012-04-12 Jeffrey Yasskin <jyasskin@google.com> + + PR libstdc++/52822 + * include/bits/stl_algo.h (__find_if_not): Expose in C++98 mode. + (__find_if_not_n): Like __find_if_not, but works on and updates a + counted range instead of a bounded range. + (stable_partition): Guarantee !__pred(*__first) in call to + __stable_partition_adaptive() or __inplace_stable_partition(). + (__stable_partition_adaptive): Use new precondition to avoid + moving/copying objects onto themselves. Guarantee new + precondition to recursive calls. + (__inplace_stable_partition): Use new precondition to simplify + base case, remove __last parameter. Guarantee new precondition to + recursive calls. + * testsuite/25_algorithms/stable_partition/moveable.cc (test02): + Test a sequence that starts with a value matching the predicate. + * testsuite/25_algorithms/stable_partition/pr52822.cc: Test + vectors, which have a destructive self-move-assignment. 2012-04-12 Paolo Carlini <paolo.carlini@oracle.com> @@ -842,30 +510,20 @@ 2012-02-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> - * config/abi/pre/gnu.ver: Remove - _ZNKSt3tr14hashIgEclEg@@GLIBCXX_3.4.10 and - _ZNKSt4hashIgEclEg@@GLIBCXX_3.4.10 export. - * config/os/gnu-linux/ldbl-extra.ver: Export - _ZNKSt3tr14hashIgEclEg@@GLIBCXX_LDBL_3.4.10 - and _ZNKSt4hashIgEclEg@@GLIBCXX_LDBL_3.4.10. - * src/hash.cc: Only define long double hash specialization if - _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL is defined. - * src/compatibility-ldbl.cc: Include "hash.cc". - (_GLIBCXX_LONG_DOUBLE_COMPAT_IMPL): Define. - (_ZNKSt4hashIeEclEe): New alias. - * testsuite/util/testsuite_abi.cc (check_version): Support - GLIBCXX_LDBL_3.4.10. - -2008-02-29 Jakub Jelinek <jakub@redhat.com> - Benjamin Kosnik <bkoz@redhat.com> - - * src/hash_c++0x.cc: Add just C++0x version of TR1 hash. - * include/bits/functional_hash.h: Remove error_code bits. - * src/Makefile.am: Add hash_c++0x.cc. + PR libstdc++/52188 + * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Remove symvers_renaming. + Remove ENABLE_SYMVERS_SOL2. + * configure: Regenerate. + * src/Makefile.am [ENABLE_SYMVERS] (libstdc++-symbols.ver): + Postprocess mapfile. + [ENABLE_SYMVERS_GNU]: Remove ENABLE_SYMVERS_SOL2 handling. * src/Makefile.in: Regenerate. - * config/abi/pre/gnu.ver: Remove hash<error_code> export. -2008-02-28 Benjamin Kosnik <bkoz@redhat.com> + * config/abi/pre/gnu.ver (GLIBCXX_3.4.5) [!__sun__ && !__svr4__]: + Don't export + _ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv. + +2012-02-25 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> PR testsuite/52201 * testsuite/29_atomics/atomic/operators/pointer_partial_void.cc: @@ -1055,53 +713,9 @@ * src/c++98/Makefile.in: Same. * testsuite/Makefile.in: Same. - * include/std/system_error: Remove. - * include/std/ostream: Remove <system_error> support. - * include/precompiled/stdc++.h: Same. - * src/system_error.cc: Remove. - * src/hash_c++0x.cc: Remove. - * config/os/mingw32/error_constants.h: Same. - * config/os/generic/error_constants.h: Same. - * config/abi/pre/gnu.ver: Adjust exports. - - * testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc: - Remove support for <system_error>. - * testsuite/27_io/basic_ostream/inserters_other/char/ - error_code.cc: Same. - * testsuite/19_diagnostics/error_code: Same. - * testsuite/19_diagnostics/error_code/cons: Same. - * testsuite/19_diagnostics/error_code/cons/1.cc: Same. - * testsuite/19_diagnostics/error_code/operators: Same. - * testsuite/19_diagnostics/error_code/operators/bool.cc: Same. - * testsuite/19_diagnostics/error_code/operators/bool_neg.cc: Same. - * testsuite/19_diagnostics/error_code/operators/equal.cc: Same. - * testsuite/19_diagnostics/error_code/operators/not_equal.cc: Same. - * testsuite/19_diagnostics/error_category: Same. - * testsuite/19_diagnostics/error_category/cons: Same. - * testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Same. - * testsuite/19_diagnostics/error_category/cons/default.cc: Same. - * testsuite/19_diagnostics/error_category/operators: Same. - * testsuite/19_diagnostics/error_category/operators/equal.cc: Same. - * testsuite/19_diagnostics/error_category/operators/not_equal.cc: Same. - * testsuite/19_diagnostics/headers/system_error: Same. - * testsuite/19_diagnostics/headers/system_error/ - types_std_c++0x.cc: Same. - * testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc: Same. - * testsuite/19_diagnostics/headers/system_error/34538.cc: Same. - * testsuite/19_diagnostics/system_error: Same. - * testsuite/19_diagnostics/system_error/ - cons_virtual_derivation.cc: Same. - * testsuite/19_diagnostics/system_error/cons-1.cc: Same. - * testsuite/19_diagnostics/system_error/what-1.cc: Same. - * testsuite/19_diagnostics/system_error/what-2.cc: Same. - * testsuite/19_diagnostics/system_error/what-big.cc: Same. - * testsuite/19_diagnostics/system_error/what-3.cc: Same. - * testsuite/19_diagnostics/system_error/what-4.cc: Same. - * testsuite/17_intro/headers/c++200x/all.cc: Same. - * testsuite/20_util/hash/requirements/explicit_instantiation.cc: Same. - * testsuite/20_util/hash/operators/size_t.cc: Same. - -2008-02-25 Jan Beulich <jbeulich@novell.com> +2012-02-14 Jonathan Wakely <jwakely.gcc@gmail.com> + + * 30_threads/thread/native_handle/typesizes.cc: Do not run on cygwin. 2012-02-14 Tom Tromey <tromey@redhat.com> @@ -1130,46 +744,25 @@ * include/profile/impl/profiler_state.h (__gnu_profile::__turn): Same. * libsupc++/guard.cc (__cxa_guard_acquire): Same. - * include/tr1/poly_laguerre.tcc: Doxygen fixes. - * include/tr1/exp_integral.tcc: Same. - * include/tr1/gamma.tcc: Same. - * include/tr1/hypergeometric.tcc: Same. - -2008-02-17 Benjamin Kosnik <bkoz@redhat.com> - - PR libstdc++/34797 - * include/parallel/settings.h (_Settings): Reconstruct Settings class - here, uglify, remove anonymous namespace and static - members. Convert to datum. - * include/parallel/types.h: Move Settings:: enumerations here, uglify. - * src/parallel_settings.cc: New, definition for _Settings member - functions. - * include/parallel/multiway_merge.h: Same. - * include/parallel/for_each.h: Same. - * include/parallel/workstealing.h: Same. - * include/parallel/base.h: Same. - * include/parallel/numeric - * include/parallel/features.h: Same. - * include/parallel/quicksort.h: Same. - * include/parallel/equally_split.h: Same. - * include/parallel/algorithmfwd.h: Same. - * include/parallel/omp_loop_static.h: Same. - * include/parallel/random_shuffle.h: Same. - * include/parallel/balanced_quicksort.h: Same. - * include/parallel/tags.h: Same. - * include/parallel/multiway_mergesort.h: Same. - * include/parallel/numericfwd.h: Same. - * include/parallel/partition.h: Same. - * include/parallel/partial_sum.h: Same. - * include/parallel/find.h: Same. - * include/parallel/algo.h: Same. - * include/parallel/omp_loop.h: Same. - * include/parallel/sort.h: Same. - - * src/Makefile.am (parallel_sources): Add parallel_settings.cc. - * src/Makefile.in: Regenerate. +2012-02-10 Benjamin Kosnik <bkoz@redhat.com> + Jonathan Wakely <jwakely.gcc@gmail.com> - * config/abi/pre/gnu.ver: Export _Settings::get and _Settings::set. + PR libstdc++/51798 continued. + * acinclude.m4 (GLIBCXX_ENABLE_ATOMIC_BUILTINS): Use __atomic_* + builtins instead of __sync_* builtins for atomic functionality. + * include/bits/shared_ptr_base.h: Same. + * include/parallel/compatibility.h: Same. + * include/profile/impl/profiler_state.h: Same. + * include/tr1/shared_ptr.h: Same. + * libsupc++/eh_ptr.cc: Same. + * libsupc++/eh_throw.cc: Same. + * libsupc++/eh_tm.cc: Same. + * libsupc++/guard.cc: Same. + * configure: Regenerated. + * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust line numbers. + * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. + +2012-02-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libstdc++/51296 * config/os/osf/ctype_base.h, @@ -1185,30 +778,11 @@ * config/abi/post/alpha-linux-gnu/baseline_symbols.txt: Regenerated. - PR libstdc++/35209 - * config/abi/pre/gnu.ver: Export stdio_sync_filebuf symbols. - * testsuite/ext/stdio_sync_filebuf/char/35209.cc: New. - * testsuite/ext/stdio_sync_filebuf/wchar_t/35209.cc: Likewise. - -2008-02-16 Benjamin Kosnik <bkoz@redhat.com> +2012-02-09 Jonathan Wakely <jwakely.gcc@gmail.com> - * include/parallel/random_number.h: Use TR1's mersenne_twister. - (random_number::genrand_bits()): Remove. - (random_number::set_seed): Remove. + * doc/xml/manual/documentation_hacking.xml: Fix invalid attribute. -2008-02-15 Benjamin Kosnik <bkoz@redhat.com> - - * include/parallel/types.h: Remove enum parallelism. - -2008-02-15 Benjamin Kosnik <bkoz@redhat.com> - - * include/parallel/types.h: Move enum parallelism here. Use - tr1/cstdint's int16_t, uint16_t, int32_t, uint32_t, int64_t, - uint64_t. - * include/parallel/multiseq_selection.h: Adjust for cstdint. - * include/parallel/compatibility.h: Same. - * include/parallel/tags.h: Just compile-time tags. - * include/parallel/base.h: Put namespace bits here. +2012-02-08 Jonathan Wakely <jwakely.gcc@gmail.com> * doc/xml/manual/status_cxx2011.xml: Update C++11 status table. @@ -1404,52 +978,6 @@ with __ATOMIC_ACQ_REL semantics instead of __sync_fetch_and_add. * include/ext/atomicity.h (__exchange_and_add, __atomic_add): Likewise. - * testsuite/22_locale/global_templates/standard_facet_hierarchies.cc: - Likewise. - * testsuite/tr1/6_containers/hash/operators/size_t.cc: Likewise. - * testsuite/tr1/6_containers/tuple/cons/big_tuples.cc: Likewise. - * testsuite/tr1/6_containers/tuple/cons/constructor.cc: Likewise. - * testsuite/tr1/6_containers/array/cons/aggregate_initialization.cc: - Likewise. - * testsuite/tr1/6_containers/array/requirements/contiguous.cc: - Likewise. - * testsuite/tr1/6_containers/array/requirements/member_swap.cc: - Likewise. - * testsuite/tr1/6_containers/array/requirements/assign.cc: Likewise. - * testsuite/tr1/6_containers/array/specialized_algorithms/swap.cc: - Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/ - less_or_equal.cc: Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/ - greater_or_equal.cc: Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/less.cc: - Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/equal.cc: - Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/not_equal.cc: - Likewise. - * testsuite/tr1/6_containers/array/comparison_operators/greater.cc: - Likewise. - * testsuite/tr1/6_containers/array/tuple_interface/get.cc: Likewise. - * testsuite/tr1/6_containers/array/element_access/at_out_of_range.cc: - Likewise. - * testsuite/tr1/6_containers/array/element_access/back.cc: Likewise. - * testsuite/tr1/6_containers/array/element_access/front.cc: Likewise. - * testsuite/tr1/6_containers/array/element_access/data.cc: Likewise. - * testsuite/tr1/6_containers/array/iterators/end_is_one_past.cc: - Likewise. - * testsuite/tr1/6_containers/array/capacity/empty.cc: Likewise. - * testsuite/tr1/6_containers/array/capacity/max_size.cc: Likewise. - * testsuite/tr1/6_containers/array/capacity/size.cc: Likewise. - * testsuite/thread/guard.cc: Likewise. - * testsuite/20_util/tuple/cons/big_tuples.cc: Likewise. - * testsuite/20_util/tuple/cons/constructor.cc: Likewise. - * testsuite/20_util/shared_ptr/creation/dr402.cc: Likewise. - * testsuite/20_util/shared_ptr/creation/make.cc: Likewise. - * testsuite/20_util/shared_ptr/creation/alloc.cc: Likewise. - * testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise. - * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: - Likewise. 2011-01-27 Rafael Avila de Espindola <rafael.espindola@gmail.com> @@ -1568,20 +1096,11 @@ 2012-01-18 François Dumont <fdumont@gcc.gnu.org> Roman Kononov <roman@binarylife.net> - PR libstdc++/34730 - * include/debug/functions.h (__check_sorted_set, - __check_sorted_set_aux): Add. - (__check_sorted): Check StrictWeakOrdering. - * include/debug/macros.h (__glibcxx_check_strict_weak_ordering, - __glibcxx_check_strict_weak_ordering_pred): Remove. - (__glibcxx_check_sorted, __glibcxx_check_sorted_pred): Adjust. - (__glibcxx_check_sorted_set, __glibcxx_check_sorted_set_pred): Add. - * include/debug/debug.h (__glibcxx_requires_sorted_set, - __glibcxx_requires_sorted_set_pred): Add. - * include/bits/stl_algo.h (merge, includes, set_union, - set_intersection, set_difference, set_symmetric_difference): - Adjust, use __glibcxx_requires_sorted_set* instead. - * testsuite/25_algorithms/set_intersection/34730.cc: New. + PR libstdc++/51866 + * include/bits/hashtable.h (_Hashtable<>::_M_insert(_Arg, false_type)): + Do not keep a reference to a potentially moved instance. + * testsuite/23_containers/unordered_multiset/insert/51866.cc: New. + * testsuite/23_containers/unordered_multimap/insert/51866.cc: New. 2012-01-17 Benjamin Kosnik <bkoz@redhat.com> @@ -1603,21 +1122,7 @@ * doc/xml/manual/documentation_hacking.xml: Update. - * include/parallel/iterator.h: Reformat to 80 columns; adjust some - inline specifiers. - * include/parallel/find_selectors.h: Likewise. - * include/parallel/losertree.h: Likewise. - * include/parallel/list_partition.h: Likewise. - * include/parallel/for_each.h: Likewise. - * include/parallel/multiseq_selection.h: Likewise. - * include/parallel/algorithmfwd.h: Likewise. - * include/parallel/for_each_selectors.h: Likewise. - * include/parallel/balanced_quicksort.h: Likewise. - * include/parallel/merge.h: Likewise. - * include/parallel/algobase.h: Likewise. - * include/parallel/find.h: Likewise. - * include/parallel/algo.h: Likewise. - * include/parallel/checkers.h: Likewise. +2012-01-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR target/47852 * configure.host (irix6.5*): Add -lpthread to OPT_LDFLAGS. @@ -1660,21 +1165,7 @@ * po/Makefile.in: Same. * python/Makefile.in: Same. - PR libstdc++/34095 - * include/parallel/multiway_merge.h (multiway_merge_bubble, - parallel_multiway_merge): Together with ::operator new use - ::operator delete. - * include/parallel/losertree.h (LoserTree<>::~LoserTree): Likewise. - * include/parallel/quicksort.h (parallel_sort_qs_divide): Likewise. - * include/parallel/random_shuffle.h (parallel_random_shuffle_drs_pu, - sequential_random_shuffle): Likewise. - * include/parallel/tree.h (_M_not_sorted_bulk_insertion_construction): - Likewise. - * include/parallel/multiway_mergesort.h (parallel_sort_mwms_pu, - parallel_sort_mwms): Likewise. - * include/parallel/partial_sum.h (parallel_partial_sum_linear): - Likewise. - * testsuite/25_algorithms/sort/34095.cc: New. +2012-01-08 Jonathan Wakely <jwakely.gcc@gmail.com> * python/libstdcxx/v6/printers.py (StdForwardListPrinter): Add. * testsuite/libstdc++-prettyprinters/cxx11.cc: New. diff --git a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h index f60d2bab2e0..dc0a5a06595 100644 --- a/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h +++ b/libstdc++-v3/config/cpu/generic/atomicity_mutex/atomicity.h @@ -1,6 +1,6 @@ // Low-level functions for atomic operations: Generic version -*- C++ -*- -// Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,7 +40,6 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#ifndef _GLIBCXX_ATOMIC_BUILTINS _Atomic_word __attribute__ ((__unused__)) __exchange_and_add(volatile _Atomic_word* __mem, int __val) throw () @@ -56,7 +55,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __attribute__ ((__unused__)) __atomic_add(volatile _Atomic_word* __mem, int __val) throw () { __exchange_and_add(__mem, __val); } -#endif - + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h index 89b380879b3..5711255844b 100644 --- a/libstdc++-v3/config/cpu/m68k/atomicity.h +++ b/libstdc++-v3/config/cpu/m68k/atomicity.h @@ -28,7 +28,6 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#ifndef _GLIBCXX_ATOMIC_BUILTINS #if ( defined(__mc68020__) || defined(__mc68030__) \ || defined(__mc68040__) || defined(__mc68060__) ) \ && !defined(__mcpu32__) @@ -128,7 +127,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // architecturally guaranteed to be atomic. __exchange_and_add(__mem, __val); } -#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h index d75cb79aaf6..cd654d685c5 100644 --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 2000, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2009, 2011, 2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -31,8 +31,6 @@ // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h // See www.netbsd.org for details of access. -#include <sys/param.h> - namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // on the mask type. Because of this, we don't use an enum. typedef unsigned char mask; -#if __NetBSD_Version__ < 599004100 +#ifndef _CTYPE_U static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index ccfd0c7eb0c..0e9e28a594c 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -639,8 +639,6 @@ BUILD_INFO_FALSE BUILD_INFO_TRUE baseline_subdir_switch baseline_dir -GLIBCXX_USE_LIBM_FALSE -GLIBCXX_USE_LIBM_TRUE GLIBCXX_LDBL_COMPAT_FALSE GLIBCXX_LDBL_COMPAT_TRUE ENABLE_VISIBILITY_FALSE @@ -3027,7 +3025,8 @@ test -n "$target_alias" && target_alias=${target_alias-$host_alias} # Handy for debugging: -#AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: $build / $host / $target / $host_alias / $target_alias" >&5 +$as_echo "$as_me: $build / $host / $target / $host_alias / $target_alias" >&6;}; sleep 5 if test "$build" != "$host"; then # We are being configured with some form of cross compiler. @@ -9713,7 +9712,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10629,7 +10628,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10647,7 +10646,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11499,7 +11498,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11502 "configure" +#line 11501 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11605,7 +11604,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11608 "configure" +#line 11607 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12537,7 +12536,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -14312,7 +14311,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -14330,7 +14329,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14963,7 +14962,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14966 "configure" +#line 14965 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15298,7 +15297,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15301 "configure" +#line 15300 "configure" int main() { typedef bool atomic_type; @@ -15333,7 +15332,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15336 "configure" +#line 15335 "configure" int main() { typedef short atomic_type; @@ -15368,7 +15367,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15371 "configure" +#line 15370 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15404,7 +15403,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15407 "configure" +#line 15406 "configure" int main() { typedef long long atomic_type; @@ -15483,7 +15482,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15486 "configure" +#line 15485 "configure" int main() { _Decimal32 d1; @@ -15525,7 +15524,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15528 "configure" +#line 15527 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -15559,7 +15558,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15562 "configure" +#line 15561 "configure" template<typename T1, typename T2> struct same { typedef T2 type; }; @@ -65214,13 +65213,6 @@ $as_echo "#define _GLIBCXX_LONG_DOUBLE_COMPAT 1" >>confdefs.h esac -ac_use_libm=yes -case "$target" in - s390*-*-tpf) - ac_use_libm=no -esac - - # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. if $GLIBCXX_IS_NATIVE ; then @@ -66272,15 +66264,6 @@ else fi - if test $ac_use_libm = yes; then - GLIBCXX_USE_LIBM_TRUE= - GLIBCXX_USE_LIBM_FALSE='#' -else - GLIBCXX_USE_LIBM_TRUE='#' - GLIBCXX_USE_LIBM_FALSE= -fi - - cat >confcache <<\_ACEOF @@ -66698,10 +66681,6 @@ if test -z "${GLIBCXX_LDBL_COMPAT_TRUE}" && test -z "${GLIBCXX_LDBL_COMPAT_FALSE as_fn_error "conditional \"GLIBCXX_LDBL_COMPAT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GLIBCXX_USE_LIBM_TRUE}" && test -z "${GLIBCXX_USE_LIBM_FALSE}"; then - as_fn_error "conditional \"GLIBCXX_USE_LIBM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then as_fn_error "conditional \"BUILD_INFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index f3a3152b53d..f04563ea758 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -332,13 +332,6 @@ case "$target" in esac GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes) -ac_use_libm=yes -case "$target" in - s390*-*-tpf) - ac_use_libm=no -esac -GLIBCXX_CONDITIONAL(GLIBCXX_USE_LIBM, test $ac_use_libm = yes) - # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. GLIBCXX_CONFIGURE_TESTSUITE diff --git a/libstdc++-v3/include/tr1/gamma.tcc b/libstdc++-v3/include/tr1/gamma.tcc index f3e736ba37a..a7c399cd445 100644 --- a/libstdc++-v3/include/tr1/gamma.tcc +++ b/libstdc++-v3/include/tr1/gamma.tcc @@ -355,8 +355,8 @@ namespace tr1 __psi_series(const _Tp __x) { _Tp __sum = -__numeric_constants<_Tp>::__gamma_e() - _Tp(1) / __x; - const unsigned long int __max_iter = 100000L; - for (unsigned long int __k = 1; __k < __max_iter; ++__k) + const unsigned int __max_iter = 100000; + for (unsigned int __k = 1; __k < __max_iter; ++__k) { const _Tp __term = __x / (__k * (__k + __x)); __sum += __term; diff --git a/libstdc++-v3/include/tr1/hypergeometric.tcc b/libstdc++-v3/include/tr1/hypergeometric.tcc index c25617aca0c..b98b5b29c74 100644 --- a/libstdc++-v3/include/tr1/hypergeometric.tcc +++ b/libstdc++-v3/include/tr1/hypergeometric.tcc @@ -82,8 +82,8 @@ namespace tr1 _Tp __term = _Tp(1); _Tp __Fac = _Tp(1); - const unsigned long int __max_iter = 100000L; - unsigned long int __i; + const unsigned int __max_iter = 100000; + unsigned int __i; for (__i = 0; __i < __max_iter; ++__i) { __term *= (__a + _Tp(__i)) * __x diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 60eaf7ca772..831f22be933 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -37,7 +37,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(glibcxxinstall_HEADERS) + $(srcdir)/Makefile.am $(bits_HEADERS) $(std_HEADERS) subdir = libsupc++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -90,17 +90,18 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bitsdir)" \ "$(DESTDIR)$(stddir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) libsupc___la_LIBADD = -am__objects_1 = array_type_info.lo atexit_arm.lo bad_cast.lo \ - bad_typeid.lo class_type_info.lo del_op.lo del_opnt.lo \ - del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \ - eh_aux_runtime.lo eh_call.lo eh_catch.lo eh_exception.lo \ - eh_globals.lo eh_personality.lo eh_term_handler.lo \ - eh_terminate.lo eh_throw.lo eh_type.lo eh_unex_handler.lo \ - enum_type_info.lo function_type_info.lo \ - fundamental_type_info.lo guard.lo new_handler.lo new_op.lo \ - new_opnt.lo new_opv.lo new_opvnt.lo pbase_type_info.lo \ - pmem_type_info.lo pointer_type_info.lo pure.lo \ - si_class_type_info.lo tinfo.lo tinfo2.lo vec.lo \ +am__objects_1 = array_type_info.lo atexit_arm.lo bad_alloc.lo \ + bad_cast.lo bad_typeid.lo class_type_info.lo del_op.lo \ + del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo \ + eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \ + eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \ + eh_term_handler.lo eh_terminate.lo eh_tm.lo eh_throw.lo \ + eh_type.lo eh_unex_handler.lo enum_type_info.lo \ + function_type_info.lo fundamental_type_info.lo guard.lo \ + guard_error.lo hash_bytes.lo nested_exception.lo \ + new_handler.lo new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \ + pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \ + pure.lo si_class_type_info.lo tinfo.lo tinfo2.lo vec.lo \ vmi_class_type_info.lo vterminate.lo @GLIBCXX_HOSTED_TRUE@am__objects_2 = cp-demangle.lo am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2) @@ -122,8 +123,7 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES) -glibcxxinstallHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(glibcxxinstall_HEADERS) +HEADERS = $(bits_HEADERS) $(std_HEADERS) ETAGS = etags CTAGS = ctags ABI_TWEAKS_SRCDIR = @ABI_TWEAKS_SRCDIR@ @@ -751,15 +751,18 @@ uninstall-am: uninstall-bitsHEADERS uninstall-stdHEADERS \ clean-libtool clean-noinstLTLIBRARIES \ clean-toolexeclibLTLIBRARIES ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-glibcxxinstallHEADERS install-info install-info-am \ - install-man install-strip install-toolexeclibLTLIBRARIES \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-glibcxxinstallHEADERS \ - uninstall-info-am uninstall-toolexeclibLTLIBRARIES + html html-am info info-am install install-am \ + install-bitsHEADERS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-stdHEADERS install-strip \ + install-toolexeclibLTLIBRARIES installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-bitsHEADERS uninstall-stdHEADERS \ + uninstall-toolexeclibLTLIBRARIES cp-demangle.c: diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index d4d44f43324..a1eb04dabf3 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -73,13 +73,8 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la -if GLIBCXX_USE_LIBM libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm -else -libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -endif + -version-info $(libtool_VERSION) ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 32ae52560e3..b10d853af49 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -366,11 +366,8 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++98/libc++98convenience.la \ $(top_builddir)/src/c++11/libc++11convenience.la -@GLIBCXX_USE_LIBM_FALSE@libstdc___la_LDFLAGS = \ -@GLIBCXX_USE_LIBM_FALSE@ -version-info $(libtool_VERSION) ${version_arg} - -@GLIBCXX_USE_LIBM_TRUE@libstdc___la_LDFLAGS = \ -@GLIBCXX_USE_LIBM_TRUE@ -version-info $(libtool_VERSION) ${version_arg} -lm +libstdc___la_LDFLAGS = \ + -version-info $(libtool_VERSION) ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc index a139de5a3e3..e54035891c5 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc @@ -1,7 +1,8 @@ // { dg-require-namedlocale "de_DE" } // { dg-require-namedlocale "es_ES" } -// Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc index 314efb42968..a433cda866d 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc @@ -2,7 +2,8 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -51,7 +52,7 @@ void test04() VERIFY( result4 == "dom" ); oss.str(empty); // "%d/%m/%y" - iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result27 = oss.str(); // "04/04/71" VERIFY( result27 == "04/04/71" ); @@ -61,7 +62,7 @@ void test04() VERIFY( result28 == "12:00:00" ); oss.str(empty); - iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result37 = oss.str(); // "04/04/71" VERIFY( result37 == "04/04/71" ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc index c01985e391b..51a0ccbb4cd 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc @@ -2,7 +2,8 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -45,13 +46,15 @@ void test04() const wstring empty; wostringstream oss; oss.imbue(loc_es); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it04 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); + + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); wstring result4 = oss.str(); VERIFY( result4 == L"dom" ); oss.str(empty); // "%d/%m/%y" - iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result27 = oss.str(); // "04/04/71" VERIFY( result27 == L"04/04/71" ); @@ -61,7 +64,7 @@ void test04() VERIFY( result28 == L"12:00:00" ); oss.str(empty); - iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result37 = oss.str(); // "04/04/71" VERIFY( result37 == L"04/04/71" ); diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc index 71d2f5e124a..716dda51b1e 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc @@ -1,6 +1,6 @@ // 2001-04-06 gdr -// Copyright (C) 2001, 2005, 2010 Free Software Foundation, Inc. +// Copyright (C) 2001, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -20,8 +20,8 @@ // { dg-do compile } // { dg-add-options no_pch } -// { dg-xfail-if "" { { *-*-linux* *-*-darwin* hppa*-*-hpux* } || { uclibc || newlib } } { "*" } { "" } } -// { dg-excess-errors "" { target { { *-*-linux* *-*-darwin* hppa*-*-hpux* } || { uclibc || newlib } } } } +// { dg-xfail-if "" { { *-*-linux* *-*-darwin* *-*-solaris2.1[0-9]* hppa*-*-hpux* } || { uclibc || newlib } } { "*" } { "" } } +// { dg-excess-errors "" { target { { *-*-linux* *-*-darwin* *-*-solaris2.1[0-9]* hppa*-*-hpux* } || { uclibc || newlib } } } } #include <math.h> diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc index fcce044482f..488e393d2a7 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc @@ -31,7 +31,5 @@ void test01() test_base io2; io1 = io2; // { dg-error "synthesized|deleted" } } -// { dg-error "synthesized" "" { target *-*-* } 42 } -// { dg-error "within this context" "" { target *-*-* } 35 } -// { dg-error "is private" "" { target *-*-* } 785 } -// { dg-error "operator=" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc index 7876d24151b..22caadc6497 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc @@ -31,7 +31,5 @@ void test02() test_base io1; test_base io2 = io1; // { dg-error "synthesized|deleted" } } -// { dg-error "within this context" "" { target *-*-* } 36 } -// { dg-error "synthesized" "" { target *-*-* } 42 } -// { dg-error "is private" "" { target *-*-* } 782 } -// { dg-error "copy constructor" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index b3d33326301..0cf8de501c8 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -102,29 +102,26 @@ new-abi-baseline: @test ! -f $*/site.exp || mv $*/site.exp $*/site.bak @mv $*/site.exp.tmp $*/site.exp -check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) +check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9) $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp # Run the testsuite in normal mode. check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp + AR="$(AR)"; export AR; \ + RANLIB="$(RANLIB)"; export RANLIB; \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ - check-DEJAGNUnormal2 check-DEJAGNUnormal3; \ - for idx in 0 1 2 3; do \ + $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \ + for idx in 0 1 2 3 4 5 6 7 8 9; do \ mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ done; \ mv -f libstdc++.sum libstdc++.sum.sep; \ mv -f libstdc++.log libstdc++.log.sep; \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ - libstdc++.sum.sep normal0/libstdc++.sum.sep \ - normal1/libstdc++.sum.sep normal2/libstdc++.sum.sep \ - normal3/libstdc++.sum.sep > libstdc++.sum; \ + libstdc++.sum.sep normal[0-9]/libstdc++.sum.sep > libstdc++.sum; \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - libstdc++.log.sep normal0/libstdc++.log.sep \ - normal1/libstdc++.log.sep normal2/libstdc++.log.sep \ - normal3/libstdc++.log.sep > libstdc++.log; \ + libstdc++.log.sep normal[0-9]/libstdc++.log.sep > libstdc++.log; \ exit 0; \ fi; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ @@ -137,16 +134,28 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp normal0) \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ - $(RUNTESTFLAGS) abi.exp; \ + $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi; \ - dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [abep]*/*`";; \ + dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \ normal1) \ - dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \ + dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \ normal2) \ - dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \ + dirs="`cd $$srcdir; echo 2[01]_*/*`";; \ normal3) \ - dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \ + dirs="`cd $$srcdir; echo 22_*/*`";; \ + normal4) \ + dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \ + normal5) \ + dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \ + normal6) \ + dirs="`cd $$srcdir; echo 2[459]_*/*`";; \ + normal7) \ + dirs="`cd $$srcdir; echo 2[68]_*/*`";; \ + normal8) \ + dirs="`cd $$srcdir; echo 27_*/*`";; \ + normal9) \ + dirs="`cd $$srcdir; echo t*/*`";; \ esac; \ if [ -n "$*" ]; then cd "$*"; fi; \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index f4894626477..bb077d148a6 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -290,7 +290,6 @@ lists_of_files = \ extract_symvers = $(glibcxx_builddir)/scripts/extract_symvers baseline_subdir := $(shell $(CXX) $(baseline_subdir_switch)) check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3 4 5 6 7 8 9) -check_DEJAGNU_normal_targets = $(patsubst %,check-DEJAGNUnormal%,0 1 2 3) # Runs the testsuite, but in compile only mode. # Can be used to test sources with non-GNU FE's at various warning @@ -406,7 +405,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -466,11 +465,15 @@ ps-am: uninstall-am: +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ clean-local distclean distclean-generic distclean-libtool dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am @@ -542,24 +545,21 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp # Run the testsuite in normal mode. check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp + AR="$(AR)"; export AR; \ + RANLIB="$(RANLIB)"; export RANLIB; \ if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \ && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \ - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNUnormal0 check-DEJAGNUnormal1 \ - check-DEJAGNUnormal2 check-DEJAGNUnormal3; \ - for idx in 0 1 2 3; do \ + $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \ + for idx in 0 1 2 3 4 5 6 7 8 9; do \ mv -f normal$$idx/libstdc++.sum normal$$idx/libstdc++.sum.sep; \ mv -f normal$$idx/libstdc++.log normal$$idx/libstdc++.log.sep; \ done; \ mv -f libstdc++.sum libstdc++.sum.sep; \ mv -f libstdc++.log libstdc++.log.sep; \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh \ - libstdc++.sum.sep normal0/libstdc++.sum.sep \ - normal1/libstdc++.sum.sep normal2/libstdc++.sum.sep \ - normal3/libstdc++.sum.sep > libstdc++.sum; \ + libstdc++.sum.sep normal[0-9]/libstdc++.sum.sep > libstdc++.sum; \ $(SHELL) $(srcdir)/../../contrib/dg-extract-results.sh -L \ - libstdc++.log.sep normal0/libstdc++.log.sep \ - normal1/libstdc++.log.sep normal2/libstdc++.log.sep \ - normal3/libstdc++.log.sep > libstdc++.log; \ + libstdc++.log.sep normal[0-9]/libstdc++.log.sep > libstdc++.log; \ exit 0; \ fi; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ @@ -572,16 +572,28 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp normal0) \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \ - $(RUNTESTFLAGS) abi.exp; \ + $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi; \ - dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [abep]*/*`";; \ + dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \ normal1) \ - dirs="`cd $$srcdir; echo 2[0-2]_*/*`";; \ + dirs="`cd $$srcdir; echo [ab]* de* [ep]*/*`";; \ normal2) \ - dirs="`cd $$srcdir; echo 2[4-9]_*/*`";; \ + dirs="`cd $$srcdir; echo 2[01]_*/*`";; \ normal3) \ - dirs="`cd $$srcdir; echo 23_*/* t*/*`";; \ + dirs="`cd $$srcdir; echo 22_*/*`";; \ + normal4) \ + dirs="`cd $$srcdir; echo 23_*/[a-km-tw-z]*`";; \ + normal5) \ + dirs="`cd $$srcdir; echo 23_*/[luv]*`";; \ + normal6) \ + dirs="`cd $$srcdir; echo 2[459]_*/*`";; \ + normal7) \ + dirs="`cd $$srcdir; echo 2[68]_*/*`";; \ + normal8) \ + dirs="`cd $$srcdir; echo 27_*/*`";; \ + normal9) \ + dirs="`cd $$srcdir; echo t*/*`";; \ esac; \ if [ -n "$*" ]; then cd "$*"; fi; \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 33b1fd316c5..d5eb5e827ad 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -1,6 +1,7 @@ # Handlers for additional dg-xxx keywords in tests. -# Copyright (C) 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,6 +107,96 @@ proc dg-require-cstdint { args } { return } +proc dg-require-cmath { args } { + if { ![ check_v3_target_cmath ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-atomic-builtins { args } { + if { ![ check_v3_target_atomic_builtins ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-gthreads { args } { + if { ![ check_v3_target_gthreads ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-gthreads-timed { args } { + if { ![ check_v3_target_gthreads_timed ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-nanosleep { args } { + if { ![ check_v3_target_nanosleep ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-sched-yield { args } { + if { ![ check_v3_target_sched_yield ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-string-conversions { args } { + if { ![ check_v3_target_string_conversions ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-swprintf { args } { + if { ![ check_v3_target_swprintf ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-binary-io { args } { + if { ![ check_v3_target_binary_io ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + +proc dg-require-nprocs { args } { + if { ![ check_v3_target_nprocs ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + proc add_options_for_no_pch { flags } { # This forces any generated and possibly included PCH to be invalid. return "-D__GLIBCXX__=99999999" diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index d063553b7cd..abb92bf358d 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -93,6 +93,8 @@ proc libstdc++_init { testfile } { global target_triplet global flags_file global tool_timeout + global DEFAULT_CXXFLAGS + global STATIC_LIBCXXFLAGS # We set LC_ALL and LANG to C so that we get the same error # messages as expected. @@ -385,13 +387,16 @@ if { [info procs saved-dg-test] == [list] } { rename dg-test saved-dg-test proc dg-test { args } { + global additional_prunes global errorInfo if { [ catch { eval saved-dg-test $args } errmsg ] } { set saved_info $errorInfo + set additional_prunes "" unset_timeout_vars error $errmsg $saved_info } + set additional_prunes "" unset_timeout_vars } } diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp index 1daf6abfa91..4c3f7cabe77 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp @@ -77,7 +77,7 @@ namespace __gnu_pbds typedef typename basic_type_rebind::const_reference basic_type_const_reference; - typedef typename cntnr::allocator::template rebind<std::pair<const basic_type, basic_type> >::other pair_type_rebind; + typedef typename cntnr::allocator_type::template rebind<std::pair<const basic_type, basic_type> >::other pair_type_rebind; typedef typename pair_type_rebind::const_reference pair_type_const_reference; template<typename Gen> |