r176397 - in /branches/x32: ./ ChangeLog Makefi...

[hjl at gcc dot gnu dot org]

Author: hjl
Date: Mon Jul 18 13:21:31 2011
New Revision: 176397

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=176397
Log:
Merged r176357 through r176371 into branch.

Modified:
    branches/x32/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr_neg.cc
    branches/x32/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/assign/shared_ptr_neg.cc

Changes in other areas also in this revision:
Added:
    branches/x32/gcc/testsuite/g++.dg/overload/template5.C
      - copied unchanged from r176371, trunk/gcc/testsuite/g++.dg/overload/template5.C
    branches/x32/gcc/testsuite/g++.dg/template/overload12.C
      - copied unchanged from r176371, trunk/gcc/testsuite/g++.dg/template/overload12.C
    branches/x32/gcc/testsuite/gfortran.dg/coarray/scalar_alloc_1.f90
      - copied unchanged from r176371, trunk/gcc/testsuite/gfortran.dg/coarray/scalar_alloc_1.f90
    branches/x32/gcc/testsuite/gfortran.dg/coarray/scalar_alloc_2.f90
      - copied unchanged from r176371, trunk/gcc/testsuite/gfortran.dg/coarray/scalar_alloc_2.f90
    branches/x32/gcc/testsuite/gfortran.dg/pointer_remapping_7.f90
      - copied unchanged from r176371, trunk/gcc/testsuite/gfortran.dg/pointer_remapping_7.f90
    branches/x32/gcc/testsuite/gnat.dg/pointer_controlled.adb
      - copied unchanged from r176371, trunk/gcc/testsuite/gnat.dg/pointer_controlled.adb
Modified:
    branches/x32/   (props changed)
    branches/x32/ChangeLog
    branches/x32/Makefile.def
    branches/x32/Makefile.in
    branches/x32/Makefile.tpl
    branches/x32/gcc/ChangeLog
    branches/x32/gcc/DATESTAMP
    branches/x32/gcc/cp/ChangeLog
    branches/x32/gcc/cp/call.c
    branches/x32/gcc/cp/class.c
    branches/x32/gcc/cp/cp-tree.h
    branches/x32/gcc/cp/error.c
    branches/x32/gcc/cp/pt.c
    branches/x32/gcc/fortran/ChangeLog
    branches/x32/gcc/fortran/expr.c
    branches/x32/gcc/fortran/gfortran.h
    branches/x32/gcc/fortran/resolve.c
    branches/x32/gcc/fortran/trans-array.c
    branches/x32/gcc/fortran/trans-decl.c
    branches/x32/gcc/fortran/trans-expr.c
    branches/x32/gcc/fortran/trans-stmt.c
    branches/x32/gcc/fortran/trans-types.c
    branches/x32/gcc/testsuite/ChangeLog
    branches/x32/gcc/testsuite/g++.dg/cpp0x/decltype29.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/error4.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/nullptr15.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/pr31431-2.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/pr31431.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/pr31434.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/sfinae11.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/temp_default2.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/trailing4.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/variadic-ex3.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/variadic-ex4.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/variadic105.C
    branches/x32/gcc/testsuite/g++.dg/cpp0x/vt-37737-2.C
    branches/x32/gcc/testsuite/g++.dg/ext/vla2.C
    branches/x32/gcc/testsuite/g++.dg/other/ptrmem10.C
    branches/x32/gcc/testsuite/g++.dg/other/ptrmem11.C
    branches/x32/gcc/testsuite/g++.dg/overload/unknown1.C
    branches/x32/gcc/testsuite/g++.dg/template/conv11.C
    branches/x32/gcc/testsuite/g++.dg/template/deduce3.C
    branches/x32/gcc/testsuite/g++.dg/template/dependent-expr5.C
    branches/x32/gcc/testsuite/g++.dg/template/error45.C
    branches/x32/gcc/testsuite/g++.dg/template/friend.C
    branches/x32/gcc/testsuite/g++.dg/template/incomplete2.C
    branches/x32/gcc/testsuite/g++.dg/template/local4.C
    branches/x32/gcc/testsuite/g++.dg/template/local6.C
    branches/x32/gcc/testsuite/g++.dg/template/operator9.C
    branches/x32/gcc/testsuite/g++.dg/template/ptrmem2.C
    branches/x32/gcc/testsuite/g++.dg/template/sfinae2.C
    branches/x32/gcc/testsuite/g++.dg/template/ttp25.C
    branches/x32/gcc/testsuite/g++.dg/template/unify10.C
    branches/x32/gcc/testsuite/g++.dg/template/unify11.C
    branches/x32/gcc/testsuite/g++.dg/template/unify6.C
    branches/x32/gcc/testsuite/g++.dg/template/unify7.C
    branches/x32/gcc/testsuite/g++.dg/template/unify9.C
    branches/x32/gcc/testsuite/g++.dg/template/varmod1.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.brendan/crash56.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/crash28.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/crash60.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/explicit41.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/explicit77.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/expr2.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/ptrmem6.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/spec5.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/spec6.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/unify4.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/unify6.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.pt/unify8.C
    branches/x32/gcc/testsuite/g++.old-deja/g++.robertl/eb98.C
    branches/x32/gcc/testsuite/gfortran.dg/coarray_14.f90
    branches/x32/gcc/testsuite/gfortran.dg/coarray_7.f90
    branches/x32/gcc/testsuite/lib/prune.exp
    branches/x32/gcc/tree.c

Propchange: branches/x32/
            ('svn:mergeinfo' modified)