r230012 - in /branches/gomp-4_0-branch: ./ gcc/...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Mon Nov  9 11:10:12 2015
New Revision: 230012

URL: https://gcc.gnu.org/viewcvs?rev=230012&root=gcc&view=rev
Log:
svn merge -r 229831:229832 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/gcc/ChangeLog
    branches/gomp-4_0-branch/gcc/c-family/ChangeLog
    branches/gomp-4_0-branch/gcc/c/ChangeLog
    branches/gomp-4_0-branch/gcc/cp/ChangeLog
    branches/gomp-4_0-branch/gcc/cp/parser.c
    branches/gomp-4_0-branch/gcc/fortran/ChangeLog
    branches/gomp-4_0-branch/gcc/fortran/openmp.c
    branches/gomp-4_0-branch/gcc/fortran/trans-openmp.c
    branches/gomp-4_0-branch/gcc/gimplify.c
    branches/gomp-4_0-branch/gcc/omp-low.c
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog
    branches/gomp-4_0-branch/gcc/testsuite/c-c++-common/goacc/combined-directives.c
    branches/gomp-4_0-branch/gcc/testsuite/c-c++-common/goacc/loop-clauses.c
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/goacc/template.C
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/combined-directives.f90
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/loop-5.f95
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/loop-6.f95
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90   (props changed)
    branches/gomp-4_0-branch/gcc/tree.c

Propchange: branches/gomp-4_0-branch/
            ('svn:mergeinfo' modified)

Propchange: branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90
            ('svn:mergeinfo' modified)