r186228 - in /branches/cilkplus: ./ contrib/Cha...

[bviyer at gcc dot gnu dot org]

Author: bviyer
Date: Sun Apr  8 23:17:55 2012
New Revision: 186228

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=186228
Log:
Merged with trunk at revision 186227.

Modified:
    branches/cilkplus/libstdc++-v3/ChangeLog
    branches/cilkplus/libstdc++-v3/src/Makefile.am
    branches/cilkplus/libstdc++-v3/src/Makefile.in
    branches/cilkplus/libstdc++-v3/src/c++98/compatibility-list.cc

Changes in other areas also in this revision:
Added:
    branches/cilkplus/gcc/testsuite/g++.dg/template/qualified-id5.C
      - copied unchanged from r186227, trunk/gcc/testsuite/g++.dg/template/qualified-id5.C
    branches/cilkplus/gcc/testsuite/gcc.target/i386/pr52882.c
      - copied unchanged from r186227, trunk/gcc/testsuite/gcc.target/i386/pr52882.c
    branches/cilkplus/gcc/testsuite/gcc.target/sh/prefetch.c
      - copied unchanged from r186227, trunk/gcc/testsuite/gcc.target/sh/prefetch.c
    branches/cilkplus/gcc/testsuite/gfortran.dg/function_optimize_11.f90
      - copied unchanged from r186227, trunk/gcc/testsuite/gfortran.dg/function_optimize_11.f90
    branches/cilkplus/gcc/testsuite/gfortran.dg/public_private_module_2.f90
      - copied unchanged from r186227, trunk/gcc/testsuite/gfortran.dg/public_private_module_2.f90
    branches/cilkplus/gcc/testsuite/gfortran.dg/use_only_6.f90
      - copied unchanged from r186227, trunk/gcc/testsuite/gfortran.dg/use_only_6.f90
Removed:
    branches/cilkplus/gcc/testsuite/gcc.target/sh/sh2a-prefetch.c
Modified:
    branches/cilkplus/   (props changed)
    branches/cilkplus/contrib/ChangeLog
    branches/cilkplus/contrib/dg-extract-results.sh
    branches/cilkplus/gcc/ChangeLog
    branches/cilkplus/gcc/DATESTAMP
    branches/cilkplus/gcc/config/arm/arm.md
    branches/cilkplus/gcc/config/i386/i386.c
    branches/cilkplus/gcc/config/i386/i386.h
    branches/cilkplus/gcc/config/i386/i386.md
    branches/cilkplus/gcc/config/ia64/ia64.c
    branches/cilkplus/gcc/config/sh/predicates.md
    branches/cilkplus/gcc/config/sh/sh-protos.h
    branches/cilkplus/gcc/config/sh/sh.c
    branches/cilkplus/gcc/config/sh/sh.h
    branches/cilkplus/gcc/config/sh/sh.md
    branches/cilkplus/gcc/cp/ChangeLog
    branches/cilkplus/gcc/cp/cp-tree.h
    branches/cilkplus/gcc/cp/semantics.c
    branches/cilkplus/gcc/cp/tree.c
    branches/cilkplus/gcc/doc/install.texi
    branches/cilkplus/gcc/doc/invoke.texi
    branches/cilkplus/gcc/fortran/ChangeLog
    branches/cilkplus/gcc/fortran/frontend-passes.c
    branches/cilkplus/gcc/fortran/module.c
    branches/cilkplus/gcc/fortran/trans-decl.c
    branches/cilkplus/gcc/gimple-fold.c
    branches/cilkplus/gcc/gimple-iterator.c
    branches/cilkplus/gcc/gimple.c
    branches/cilkplus/gcc/gimple.h
    branches/cilkplus/gcc/gimplify.c
    branches/cilkplus/gcc/lto/ChangeLog
    branches/cilkplus/gcc/lto/lto-lang.c
    branches/cilkplus/gcc/po/ChangeLog
    branches/cilkplus/gcc/po/es.po
    branches/cilkplus/gcc/testsuite/ChangeLog
    branches/cilkplus/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C
    branches/cilkplus/gcc/testsuite/gcc.dg/pr49994-3.c
    branches/cilkplus/gcc/testsuite/gcc.dg/vect/costmodel/ppc/ppc-costmodel-vect.exp
    branches/cilkplus/gcc/testsuite/gcc.dg/vect/vect.exp
    branches/cilkplus/gcc/tree-eh.c
    branches/cilkplus/gcc/tree-nrv.c
    branches/cilkplus/gcc/tree-sra.c
    branches/cilkplus/gcc/tree-ssa-dom.c
    branches/cilkplus/gcc/tree-ssa-dse.c
    branches/cilkplus/gcc/tree-ssa-forwprop.c
    branches/cilkplus/gcc/tree-ssa-math-opts.c
    branches/cilkplus/gcc/tree-ssa-operands.c
    branches/cilkplus/gcc/tree-ssa-pre.c
    branches/cilkplus/gcc/tree-ssanames.c
    branches/cilkplus/gcc/tree-vect-loop.c
    branches/cilkplus/gcc/tree-vect-slp.c
    branches/cilkplus/gcc/tree-vect-stmts.c
    branches/cilkplus/libjava/ChangeLog
    branches/cilkplus/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc
    branches/cilkplus/libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc

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