r174572 - in /branches/ibm/gcc-4_6-branch: ./ g...

[meissner at gcc dot gnu dot org]

Author: meissner
Date: Thu Jun  2 18:15:04 2011
New Revision: 174572

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=174572
Log:
Merge up to 147363

Added:
    branches/ibm/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/enum18.C
      - copied unchanged from r174363, branches/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/enum18.C
    branches/ibm/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/error6.C
      - copied unchanged from r174363, branches/gcc-4_6-branch/gcc/testsuite/g++.dg/cpp0x/error6.C
    branches/ibm/gcc-4_6-branch/gcc/testsuite/g++.dg/eh/cond6.C
      - copied unchanged from r174363, branches/gcc-4_6-branch/gcc/testsuite/g++.dg/eh/cond6.C
    branches/ibm/gcc-4_6-branch/gcc/testsuite/g++.dg/template/const5.C
      - copied unchanged from r174363, branches/gcc-4_6-branch/gcc/testsuite/g++.dg/template/const5.C
    branches/ibm/gcc-4_6-branch/gcc/testsuite/gfortran.dg/dependency_40.f90
      - copied unchanged from r174363, branches/gcc-4_6-branch/gcc/testsuite/gfortran.dg/dependency_40.f90
Modified:
    branches/ibm/gcc-4_6-branch/   (props changed)
    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/c-family/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/c-family/c-common.c
    branches/ibm/gcc-4_6-branch/gcc/config/rs6000/rs6000.c   (props changed)
    branches/ibm/gcc-4_6-branch/gcc/config/rs6000/rs6000.h   (props changed)
    branches/ibm/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/cp/decl.c
    branches/ibm/gcc-4_6-branch/gcc/cp/error.c
    branches/ibm/gcc-4_6-branch/gcc/cp/parser.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/ChangeLog
    branches/ibm/gcc-4_6-branch/gcc/fortran/dependency.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/gfortran.h
    branches/ibm/gcc-4_6-branch/gcc/fortran/trans-array.c
    branches/ibm/gcc-4_6-branch/gcc/fortran/trans-expr.c
    branches/ibm/gcc-4_6-branch/gcc/testsuite/ChangeLog

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

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

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

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