r185017 - in /branches/ibm/gcc-4_6-branch: ./ C...

[meissner@gcc.gnu.org]

Author: meissner
Date: Tue Mar  6 20:56:09 2012
New Revision: 185017

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=185017
Log:
Merge up to 185014 to get fix for pr 50310.


Added:
    branches/ibm/gcc-4_6-branch/libstdc++-v3/testsuite/23_containers/unordered_set/operators/52309.cc
      - copied unchanged from r185014, branches/gcc-4_6-branch/libstdc++-v3/testsuite/23_containers/unordered_set/operators/52309.cc
Modified:
    branches/ibm/gcc-4_6-branch/libstdc++-v3/ChangeLog
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/bits/hashtable_policy.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/base.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_algos.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_container_size.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_hash_func.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_hashtable_size.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_list_to_slist.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_list_to_vector.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_map_to_unordered_map.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_node.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_state.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_trace.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_vector_size.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/impl/profiler_vector_to_list.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/map
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/map.h
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/set
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/unordered_map
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/unordered_set
    branches/ibm/gcc-4_6-branch/libstdc++-v3/include/profile/vector
    branches/ibm/gcc-4_6-branch/libstdc++-v3/python/Makefile.am
    branches/ibm/gcc-4_6-branch/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-2.cc
    branches/ibm/gcc-4_6-branch/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc
    branches/ibm/gcc-4_6-branch/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/dr1261.cc

Changes in other areas also in this revision:
Added:
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gcc.c-torture/execute/pr52286.c
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gcc.c-torture/execute/pr52286.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gcc.dg/bf-ms-layout-3.c
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gcc.dg/bf-ms-layout-3.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gcc.dg/noncompile/pr52290.c
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gcc.dg/noncompile/pr52290.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gcc.target/i386/pr52330.c
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gcc.target/i386/pr52330.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gcc.target/powerpc/pr52457.c
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gcc.target/powerpc/pr52457.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gfortran.dg/intrinsic_8.f90
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gfortran.dg/intrinsic_8.f90
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gfortran.dg/io_constraints_10.f90
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gfortran.dg/io_constraints_10.f90
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90
      - copied unchanged from r185014, branches/gcc-4_6-branch/gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90
Modified:
    branches/ibm/gcc-4_6-branch/   (props changed)
    branches/ibm/gcc-4_6-branch/ChangeLog
    branches/ibm/gcc-4_6-branch/boehm-gc/ChangeLog
    branches/ibm/gcc-4_6-branch/boehm-gc/configure
    branches/ibm/gcc-4_6-branch/boehm-gc/configure.ac
    branches/ibm/gcc-4_6-branch/boehm-gc/include/gc_config.h.in
    branches/ibm/gcc-4_6-branch/boehm-gc/include/private/gcconfig.h
    branches/ibm/gcc-4_6-branch/config/ChangeLog
    branches/ibm/gcc-4_6-branch/contrib/ChangeLog
    branches/ibm/gcc-4_6-branch/contrib/reghunt/ChangeLog
    branches/ibm/gcc-4_6-branch/contrib/regression/ChangeLog
    branches/ibm/gcc-4_6-branch/fixincludes/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/BASE-VER
    branches/ibm/gcc-4_6-branch/gcc/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/ChangeLog.ibm
    branches/ibm/gcc-4_6-branch/gcc/DATESTAMP
    branches/ibm/gcc-4_6-branch/gcc/REVISION
    branches/ibm/gcc-4_6-branch/gcc/ada/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/c-decl.c
    branches/ibm/gcc-4_6-branch/gcc/c-family/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/config/arm/thumb2.md
    branches/ibm/gcc-4_6-branch/gcc/config/i386/i386.c
    branches/ibm/gcc-4_6-branch/gcc/config/pa/pa.md
    branches/ibm/gcc-4_6-branch/gcc/config/pa/predicates.md
    branches/ibm/gcc-4_6-branch/gcc/config/rs6000/rs6000.c
    branches/ibm/gcc-4_6-branch/gcc/config/rs6000/vector.md
    branches/ibm/gcc-4_6-branch/gcc/config/rs6000/vsx.md
    branches/ibm/gcc-4_6-branch/gcc/config/s390/s390.md
    branches/ibm/gcc-4_6-branch/gcc/config/sparc/sparc.c
    branches/ibm/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/dwarf2out.c
    branches/ibm/gcc-4_6-branch/gcc/fold-const.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/fortran/io.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/resolve.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/trans-expr.c
    branches/ibm/gcc-4_6-branch/gcc/go/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/gthr.h
    branches/ibm/gcc-4_6-branch/gcc/java/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/lto/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/objc/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/objcp/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/po/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/stor-layout.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/testsuite/lib/target-supports.exp
    branches/ibm/gcc-4_6-branch/gnattools/ChangeLog
    branches/ibm/gcc-4_6-branch/include/ChangeLog
    branches/ibm/gcc-4_6-branch/intl/ChangeLog
    branches/ibm/gcc-4_6-branch/libada/ChangeLog
    branches/ibm/gcc-4_6-branch/libcpp/ChangeLog
    branches/ibm/gcc-4_6-branch/libcpp/po/ChangeLog
    branches/ibm/gcc-4_6-branch/libdecnumber/ChangeLog
    branches/ibm/gcc-4_6-branch/libffi/ChangeLog
    branches/ibm/gcc-4_6-branch/libgcc/ChangeLog
    branches/ibm/gcc-4_6-branch/libgcc/config/libbid/ChangeLog
    branches/ibm/gcc-4_6-branch/libgfortran/ChangeLog
    branches/ibm/gcc-4_6-branch/libgomp/ChangeLog
    branches/ibm/gcc-4_6-branch/libiberty/ChangeLog
    branches/ibm/gcc-4_6-branch/libjava/ChangeLog
    branches/ibm/gcc-4_6-branch/libjava/classpath/ChangeLog
    branches/ibm/gcc-4_6-branch/libjava/configure
    branches/ibm/gcc-4_6-branch/libjava/configure.ac
    branches/ibm/gcc-4_6-branch/libjava/libltdl/ChangeLog
    branches/ibm/gcc-4_6-branch/libmudflap/ChangeLog
    branches/ibm/gcc-4_6-branch/libobjc/ChangeLog
    branches/ibm/gcc-4_6-branch/libquadmath/ChangeLog
    branches/ibm/gcc-4_6-branch/libssp/ChangeLog
    branches/ibm/gcc-4_6-branch/lto-plugin/ChangeLog
    branches/ibm/gcc-4_6-branch/maintainer-scripts/ChangeLog
    branches/ibm/gcc-4_6-branch/zlib/ChangeLog

Propchange: branches/ibm/gcc-4_6-branch/
            ('svn:mergeinfo' modified)

Propchange: branches/ibm/gcc-4_6-branch/
            ('svnmerge-integrated' modified)