r234664 - in /branches/gomp-4_0-branch: ./ libg...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Fri Apr  1 08:41:44 2016
New Revision: 234664

URL: https://gcc.gnu.org/viewcvs?rev=234664&root=gcc&view=rev
Log:
svn merge -r 234469:234471 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/libgomp/ChangeLog
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c++/c++.exp   (contents, props changed)
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/avoid-offloading-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/avoid-offloading-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/if-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-auto-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-default-compile.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-default-runtime.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-g-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-g-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-gwv-1.c
    branches/gomp-4_0-branch/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
    branches/gomp-4_0-branch/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
    branches/gomp-4_0-branch/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
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-red-wv-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-v-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-w-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/loop-wv-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-3.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-g-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-gwv-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-v-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-vec-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-w-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-work-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-1.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c-c++-common/worker-partn-8.c
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c/c.exp   (contents, props changed)

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

Propchange: branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c++/c++.exp
            ('svn:mergeinfo' modified)

Propchange: branches/gomp-4_0-branch/libgomp/testsuite/libgomp.oacc-c/c.exp
            ('svn:mergeinfo' modified)