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

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Fri Nov  6 09:40:44 2015
New Revision: 229837

URL: https://gcc.gnu.org/viewcvs?rev=229837&root=gcc&view=rev
Log:
svn merge -r 229768:229770 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Added:
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-g-1.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-g-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-gwv-1.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-gwv-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-v-1.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-v-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-v-2.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-v-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-w-1.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-w-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-w-2.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-w-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-wv-1.c
      - copied unchanged from r229770, trunk/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-wv-1.c
Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/reduction-2.f95   (props changed)
    branches/gomp-4_0-branch/libgomp/ChangeLog
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90   (props changed)

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

Propchange: branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/reduction-2.f95
            ('svn:mergeinfo' modified)

Propchange: branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-fortran/reduction-5.f90
            ('svn:mergeinfo' modified)