From a78a06124f4047ec46a85e539e83640cc973aec1 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 5 Nov 2014 16:16:14 +0000 Subject: [PATCH] libgomp testsuite: OpenACC C++ testing. libgomp/ * testsuite/libgomp.oacc-c++/c++.exp: Enable libgomp.oacc-c-c++-common testing. * testsuite/libgomp.oacc-c/c.exp: Likewise. * testsuite/libgomp.oacc-c/abort-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/abort-2.c: ... this. * testsuite/libgomp.oacc-c/abort.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/abort.c: ... this. * testsuite/libgomp.oacc-c/acc_on_device-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c: ... this. * testsuite/libgomp.oacc-c/clauses-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/clauses-1.c: ... this. * testsuite/libgomp.oacc-c/clauses-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/clauses-2.c: ... this. * testsuite/libgomp.oacc-c/context-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/context-1.c: ... this. * testsuite/libgomp.oacc-c/context-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/context-2.c: ... this. * testsuite/libgomp.oacc-c/context-3.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/context-3.c: ... this. * testsuite/libgomp.oacc-c/context-4.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/context-4.c: ... this. * testsuite/libgomp.oacc-c/data-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/data-1.c: ... this. * testsuite/libgomp.oacc-c/data-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/data-2.c: ... this. * testsuite/libgomp.oacc-c/data-3.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/data-3.c: ... this. * testsuite/libgomp.oacc-c/deviceptr-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c: ... this. * testsuite/libgomp.oacc-c/if-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/if-1.c: ... this. * testsuite/libgomp.oacc-c/kernels-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/kernels-1.c: ... this. * testsuite/libgomp.oacc-c/lib-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-1.c: ... this. * testsuite/libgomp.oacc-c/lib-10.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-10.c: ... this. * testsuite/libgomp.oacc-c/lib-11.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-11.c: ... this. * testsuite/libgomp.oacc-c/lib-12.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-12.c: ... this. * testsuite/libgomp.oacc-c/lib-13.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-13.c: ... this. * testsuite/libgomp.oacc-c/lib-14.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-14.c: ... this. * testsuite/libgomp.oacc-c/lib-15.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-15.c: ... this. * testsuite/libgomp.oacc-c/lib-16.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-16.c: ... this. * testsuite/libgomp.oacc-c/lib-17.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-17.c: ... this. * testsuite/libgomp.oacc-c/lib-18.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-18.c: ... this. * testsuite/libgomp.oacc-c/lib-19.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-19.c: ... this. * testsuite/libgomp.oacc-c/lib-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-2.c: ... this. * testsuite/libgomp.oacc-c/lib-20.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-20.c: ... this. * testsuite/libgomp.oacc-c/lib-21.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-21.c: ... this. * testsuite/libgomp.oacc-c/lib-22.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-22.c: ... this. * testsuite/libgomp.oacc-c/lib-23.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-23.c: ... this. * testsuite/libgomp.oacc-c/lib-24.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-24.c: ... this. * testsuite/libgomp.oacc-c/lib-25.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-25.c: ... this. * testsuite/libgomp.oacc-c/lib-26.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-26.c: ... this. * testsuite/libgomp.oacc-c/lib-27.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-27.c: ... this. * testsuite/libgomp.oacc-c/lib-28.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-28.c: ... this. * testsuite/libgomp.oacc-c/lib-29.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-29.c: ... this. * testsuite/libgomp.oacc-c/lib-3.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-3.c: ... this. * testsuite/libgomp.oacc-c/lib-30.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-30.c: ... this. * testsuite/libgomp.oacc-c/lib-31.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-31.c: ... this. * testsuite/libgomp.oacc-c/lib-32.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-32.c: ... this. * testsuite/libgomp.oacc-c/lib-33.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-33.c: ... this. * testsuite/libgomp.oacc-c/lib-34.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-34.c: ... this. * testsuite/libgomp.oacc-c/lib-35.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-35.c: ... this. * testsuite/libgomp.oacc-c/lib-36.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-36.c: ... this. * testsuite/libgomp.oacc-c/lib-37.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-37.c: ... this. * testsuite/libgomp.oacc-c/lib-38.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-38.c: ... this. * testsuite/libgomp.oacc-c/lib-39.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-39.c: ... this. * testsuite/libgomp.oacc-c/lib-4.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-4.c: ... this. * testsuite/libgomp.oacc-c/lib-40.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-40.c: ... this. * testsuite/libgomp.oacc-c/lib-41.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-41.c: ... this. * testsuite/libgomp.oacc-c/lib-42.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-42.c: ... this. * testsuite/libgomp.oacc-c/lib-43.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-43.c: ... this. * testsuite/libgomp.oacc-c/lib-44.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-44.c: ... this. * testsuite/libgomp.oacc-c/lib-45.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-45.c: ... this. * testsuite/libgomp.oacc-c/lib-46.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-46.c: ... this. * testsuite/libgomp.oacc-c/lib-47.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-47.c: ... this. * testsuite/libgomp.oacc-c/lib-48.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-48.c: ... this. * testsuite/libgomp.oacc-c/lib-49.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-49.c: ... this. * testsuite/libgomp.oacc-c/lib-5.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-5.c: ... this. * testsuite/libgomp.oacc-c/lib-50.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-50.c: ... this. * testsuite/libgomp.oacc-c/lib-51.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-51.c: ... this. * testsuite/libgomp.oacc-c/lib-52.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-52.c: ... this. * testsuite/libgomp.oacc-c/lib-53.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-53.c: ... this. * testsuite/libgomp.oacc-c/lib-54.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-54.c: ... this. * testsuite/libgomp.oacc-c/lib-55.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-55.c: ... this. * testsuite/libgomp.oacc-c/lib-56.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-56.c: ... this. * testsuite/libgomp.oacc-c/lib-57.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-57.c: ... this. * testsuite/libgomp.oacc-c/lib-58.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-58.c: ... this. * testsuite/libgomp.oacc-c/lib-59.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-59.c: ... this. * testsuite/libgomp.oacc-c/lib-6.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-6.c: ... this. * testsuite/libgomp.oacc-c/lib-60.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-60.c: ... this. * testsuite/libgomp.oacc-c/lib-61.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-61.c: ... this. * testsuite/libgomp.oacc-c/lib-62.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-62.c: ... this. * testsuite/libgomp.oacc-c/lib-63.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-63.c: ... this. * testsuite/libgomp.oacc-c/lib-64.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-64.c: ... this. * testsuite/libgomp.oacc-c/lib-65.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-65.c: ... this. * testsuite/libgomp.oacc-c/lib-66.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-66.c: ... this. * testsuite/libgomp.oacc-c/lib-67.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-67.c: ... this. * testsuite/libgomp.oacc-c/lib-68.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-68.c: ... this. * testsuite/libgomp.oacc-c/lib-69.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-69.c: ... this. * testsuite/libgomp.oacc-c/lib-7.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-7.c: ... this. * testsuite/libgomp.oacc-c/lib-70.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-70.c: ... this. * testsuite/libgomp.oacc-c/lib-71.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-71.c: ... this. * testsuite/libgomp.oacc-c/lib-72.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-72.c: ... this. * testsuite/libgomp.oacc-c/lib-73.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-73.c: ... this. * testsuite/libgomp.oacc-c/lib-74.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-74.c: ... this. * testsuite/libgomp.oacc-c/lib-75.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-75.c: ... this. * testsuite/libgomp.oacc-c/lib-76.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-76.c: ... this. * testsuite/libgomp.oacc-c/lib-77.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-77.c: ... this. * testsuite/libgomp.oacc-c/lib-78.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-78.c: ... this. * testsuite/libgomp.oacc-c/lib-79.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-79.c: ... this. * testsuite/libgomp.oacc-c/lib-80.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-80.c: ... this. * testsuite/libgomp.oacc-c/lib-81.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-81.c: ... this. * testsuite/libgomp.oacc-c/lib-82.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-82.c: ... this. * testsuite/libgomp.oacc-c/lib-83.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-83.c: ... this. * testsuite/libgomp.oacc-c/lib-84.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-84.c: ... this. * testsuite/libgomp.oacc-c/lib-85.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-85.c: ... this. * testsuite/libgomp.oacc-c/lib-86.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-86.c: ... this. * testsuite/libgomp.oacc-c/lib-87.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-87.c: ... this. * testsuite/libgomp.oacc-c/lib-88.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-88.c: ... this. * testsuite/libgomp.oacc-c/lib-89.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-89.c: ... this. * testsuite/libgomp.oacc-c/lib-9.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-9.c: ... this. * testsuite/libgomp.oacc-c/lib-90.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-90.c: ... this. * testsuite/libgomp.oacc-c/lib-91.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-91.c: ... this. * testsuite/libgomp.oacc-c/lib-92.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/lib-92.c: ... this. * testsuite/libgomp.oacc-c/nested-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/nested-1.c: ... this. * testsuite/libgomp.oacc-c/nested-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/nested-2.c: ... this. * testsuite/libgomp.oacc-c/offset-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/offset-1.c: ... this. * testsuite/libgomp.oacc-c/parallel-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/parallel-1.c: ... this. * testsuite/libgomp.oacc-c/pointer-align-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/pointer-align-1.c: ... this. * testsuite/libgomp.oacc-c/present-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/present-1.c: ... this. * testsuite/libgomp.oacc-c/present-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/present-2.c: ... this. * testsuite/libgomp.oacc-c/reduction-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-1.c: ... this. * testsuite/libgomp.oacc-c/reduction-2.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-2.c: ... this. * testsuite/libgomp.oacc-c/reduction-3.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-3.c: ... this. * testsuite/libgomp.oacc-c/reduction-4.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-4.c: ... this. * testsuite/libgomp.oacc-c/reduction-5.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-5.c: ... this. * testsuite/libgomp.oacc-c/reduction-initial-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/reduction-initial-1.c: ... this. * testsuite/libgomp.oacc-c/subr.cu: Rename to... * testsuite/libgomp.oacc-c-c++-common/subr.cu: ... this. * testsuite/libgomp.oacc-c/subr.ptx: Rename to... * testsuite/libgomp.oacc-c-c++-common/subr.ptx: ... this. * testsuite/libgomp.oacc-c/timer.h: Rename to... * testsuite/libgomp.oacc-c-c++-common/timer.h: ... this. * testsuite/libgomp.oacc-c/update-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/update-1.c: ... this. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@217143 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog.gomp | 251 +++++++++++++++++++++ libgomp/testsuite/libgomp.oacc-c++/c++.exp | 18 +- .../abort-2.c | 0 .../abort.c | 0 .../acc_on_device-1.c | 0 .../clauses-1.c | 0 .../clauses-2.c | 0 .../context-1.c | 0 .../context-2.c | 0 .../context-3.c | 0 .../context-4.c | 0 .../data-1.c | 0 .../data-2.c | 0 .../data-3.c | 0 .../deviceptr-1.c | 0 .../if-1.c | 0 .../kernels-1.c | 0 .../lib-1.c | 0 .../lib-10.c | 0 .../lib-11.c | 0 .../lib-12.c | 0 .../lib-13.c | 0 .../lib-14.c | 0 .../lib-15.c | 0 .../lib-16.c | 0 .../lib-17.c | 0 .../lib-18.c | 0 .../lib-19.c | 0 .../lib-2.c | 0 .../lib-20.c | 0 .../lib-21.c | 0 .../lib-22.c | 0 .../lib-23.c | 0 .../lib-24.c | 0 .../lib-25.c | 0 .../lib-26.c | 0 .../lib-27.c | 0 .../lib-28.c | 0 .../lib-29.c | 0 .../lib-3.c | 0 .../lib-30.c | 0 .../lib-31.c | 0 .../lib-32.c | 0 .../lib-33.c | 0 .../lib-34.c | 0 .../lib-35.c | 0 .../lib-36.c | 0 .../lib-37.c | 0 .../lib-38.c | 0 .../lib-39.c | 0 .../lib-4.c | 0 .../lib-40.c | 0 .../lib-41.c | 0 .../lib-42.c | 0 .../lib-43.c | 0 .../lib-44.c | 0 .../lib-45.c | 0 .../lib-46.c | 0 .../lib-47.c | 0 .../lib-48.c | 0 .../lib-49.c | 0 .../lib-5.c | 0 .../lib-50.c | 0 .../lib-51.c | 0 .../lib-52.c | 0 .../lib-53.c | 0 .../lib-54.c | 0 .../lib-55.c | 0 .../lib-56.c | 0 .../lib-57.c | 0 .../lib-58.c | 0 .../lib-59.c | 0 .../lib-6.c | 0 .../lib-60.c | 0 .../lib-61.c | 0 .../lib-62.c | 0 .../lib-63.c | 0 .../lib-64.c | 0 .../lib-65.c | 0 .../lib-66.c | 0 .../lib-67.c | 0 .../lib-68.c | 0 .../lib-69.c | 0 .../lib-7.c | 0 .../lib-70.c | 0 .../lib-71.c | 0 .../lib-72.c | 0 .../lib-73.c | 0 .../lib-74.c | 0 .../lib-75.c | 0 .../lib-76.c | 0 .../lib-77.c | 0 .../lib-78.c | 0 .../lib-79.c | 0 .../lib-80.c | 0 .../lib-81.c | 0 .../lib-82.c | 0 .../lib-83.c | 0 .../lib-84.c | 0 .../lib-85.c | 0 .../lib-86.c | 0 .../lib-87.c | 0 .../lib-88.c | 0 .../lib-89.c | 0 .../lib-9.c | 0 .../lib-90.c | 0 .../lib-91.c | 0 .../lib-92.c | 0 .../nested-1.c | 0 .../nested-2.c | 0 .../offset-1.c | 0 .../parallel-1.c | 0 .../pointer-align-1.c | 0 .../present-1.c | 0 .../present-2.c | 0 .../reduction-1.c | 0 .../reduction-2.c | 0 .../reduction-3.c | 0 .../reduction-4.c | 0 .../reduction-5.c | 0 .../reduction-initial-1.c | 0 .../subr.cu | 0 .../subr.ptx | 0 .../timer.h | 0 .../update-1.c | 0 libgomp/testsuite/libgomp.oacc-c/c.exp | 9 +- 126 files changed, 274 insertions(+), 4 deletions(-) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/abort-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/abort.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/acc_on_device-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/clauses-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/clauses-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/context-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/context-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/context-3.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/context-4.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/data-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/data-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/data-3.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/deviceptr-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/if-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/kernels-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-10.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-11.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-12.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-13.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-14.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-15.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-16.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-17.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-18.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-19.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-20.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-21.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-22.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-23.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-24.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-25.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-26.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-27.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-28.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-29.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-3.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-30.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-31.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-32.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-33.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-34.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-35.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-36.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-37.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-38.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-39.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-4.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-40.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-41.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-42.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-43.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-44.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-45.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-46.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-47.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-48.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-49.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-5.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-50.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-51.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-52.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-53.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-54.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-55.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-56.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-57.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-58.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-59.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-6.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-60.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-61.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-62.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-63.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-64.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-65.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-66.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-67.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-68.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-69.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-7.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-70.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-71.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-72.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-73.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-74.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-75.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-76.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-77.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-78.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-79.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-80.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-81.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-82.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-83.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-84.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-85.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-86.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-87.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-88.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-89.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-9.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-90.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-91.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/lib-92.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/nested-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/nested-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/offset-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/parallel-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/pointer-align-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/present-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/present-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-2.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-3.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-4.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-5.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/reduction-initial-1.c (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/subr.cu (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/subr.ptx (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/timer.h (100%) rename libgomp/testsuite/{libgomp.oacc-c => libgomp.oacc-c-c++-common}/update-1.c (100%) diff --git a/libgomp/ChangeLog.gomp b/libgomp/ChangeLog.gomp index d4cde2f8b4e..8dc947daee3 100644 --- a/libgomp/ChangeLog.gomp +++ b/libgomp/ChangeLog.gomp @@ -1,4 +1,255 @@ 2014-11-05 Thomas Schwinge + James Norris + + * testsuite/libgomp.oacc-c++/c++.exp: Enable + libgomp.oacc-c-c++-common testing. + * testsuite/libgomp.oacc-c/c.exp: Likewise. + * testsuite/libgomp.oacc-c/abort-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/abort-2.c: ... this. + * testsuite/libgomp.oacc-c/abort.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/abort.c: ... this. + * testsuite/libgomp.oacc-c/acc_on_device-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c: ... this. + * testsuite/libgomp.oacc-c/clauses-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/clauses-1.c: ... this. + * testsuite/libgomp.oacc-c/clauses-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/clauses-2.c: ... this. + * testsuite/libgomp.oacc-c/context-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/context-1.c: ... this. + * testsuite/libgomp.oacc-c/context-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/context-2.c: ... this. + * testsuite/libgomp.oacc-c/context-3.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/context-3.c: ... this. + * testsuite/libgomp.oacc-c/context-4.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/context-4.c: ... this. + * testsuite/libgomp.oacc-c/data-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/data-1.c: ... this. + * testsuite/libgomp.oacc-c/data-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/data-2.c: ... this. + * testsuite/libgomp.oacc-c/data-3.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/data-3.c: ... this. + * testsuite/libgomp.oacc-c/deviceptr-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c: ... this. + * testsuite/libgomp.oacc-c/if-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/if-1.c: ... this. + * testsuite/libgomp.oacc-c/kernels-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/kernels-1.c: ... this. + * testsuite/libgomp.oacc-c/lib-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-1.c: ... this. + * testsuite/libgomp.oacc-c/lib-10.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-10.c: ... this. + * testsuite/libgomp.oacc-c/lib-11.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-11.c: ... this. + * testsuite/libgomp.oacc-c/lib-12.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-12.c: ... this. + * testsuite/libgomp.oacc-c/lib-13.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-13.c: ... this. + * testsuite/libgomp.oacc-c/lib-14.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-14.c: ... this. + * testsuite/libgomp.oacc-c/lib-15.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-15.c: ... this. + * testsuite/libgomp.oacc-c/lib-16.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-16.c: ... this. + * testsuite/libgomp.oacc-c/lib-17.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-17.c: ... this. + * testsuite/libgomp.oacc-c/lib-18.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-18.c: ... this. + * testsuite/libgomp.oacc-c/lib-19.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-19.c: ... this. + * testsuite/libgomp.oacc-c/lib-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-2.c: ... this. + * testsuite/libgomp.oacc-c/lib-20.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-20.c: ... this. + * testsuite/libgomp.oacc-c/lib-21.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-21.c: ... this. + * testsuite/libgomp.oacc-c/lib-22.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-22.c: ... this. + * testsuite/libgomp.oacc-c/lib-23.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-23.c: ... this. + * testsuite/libgomp.oacc-c/lib-24.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-24.c: ... this. + * testsuite/libgomp.oacc-c/lib-25.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-25.c: ... this. + * testsuite/libgomp.oacc-c/lib-26.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-26.c: ... this. + * testsuite/libgomp.oacc-c/lib-27.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-27.c: ... this. + * testsuite/libgomp.oacc-c/lib-28.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-28.c: ... this. + * testsuite/libgomp.oacc-c/lib-29.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-29.c: ... this. + * testsuite/libgomp.oacc-c/lib-3.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-3.c: ... this. + * testsuite/libgomp.oacc-c/lib-30.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-30.c: ... this. + * testsuite/libgomp.oacc-c/lib-31.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-31.c: ... this. + * testsuite/libgomp.oacc-c/lib-32.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-32.c: ... this. + * testsuite/libgomp.oacc-c/lib-33.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-33.c: ... this. + * testsuite/libgomp.oacc-c/lib-34.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-34.c: ... this. + * testsuite/libgomp.oacc-c/lib-35.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-35.c: ... this. + * testsuite/libgomp.oacc-c/lib-36.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-36.c: ... this. + * testsuite/libgomp.oacc-c/lib-37.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-37.c: ... this. + * testsuite/libgomp.oacc-c/lib-38.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-38.c: ... this. + * testsuite/libgomp.oacc-c/lib-39.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-39.c: ... this. + * testsuite/libgomp.oacc-c/lib-4.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-4.c: ... this. + * testsuite/libgomp.oacc-c/lib-40.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-40.c: ... this. + * testsuite/libgomp.oacc-c/lib-41.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-41.c: ... this. + * testsuite/libgomp.oacc-c/lib-42.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-42.c: ... this. + * testsuite/libgomp.oacc-c/lib-43.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-43.c: ... this. + * testsuite/libgomp.oacc-c/lib-44.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-44.c: ... this. + * testsuite/libgomp.oacc-c/lib-45.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-45.c: ... this. + * testsuite/libgomp.oacc-c/lib-46.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-46.c: ... this. + * testsuite/libgomp.oacc-c/lib-47.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-47.c: ... this. + * testsuite/libgomp.oacc-c/lib-48.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-48.c: ... this. + * testsuite/libgomp.oacc-c/lib-49.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-49.c: ... this. + * testsuite/libgomp.oacc-c/lib-5.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-5.c: ... this. + * testsuite/libgomp.oacc-c/lib-50.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-50.c: ... this. + * testsuite/libgomp.oacc-c/lib-51.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-51.c: ... this. + * testsuite/libgomp.oacc-c/lib-52.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-52.c: ... this. + * testsuite/libgomp.oacc-c/lib-53.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-53.c: ... this. + * testsuite/libgomp.oacc-c/lib-54.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-54.c: ... this. + * testsuite/libgomp.oacc-c/lib-55.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-55.c: ... this. + * testsuite/libgomp.oacc-c/lib-56.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-56.c: ... this. + * testsuite/libgomp.oacc-c/lib-57.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-57.c: ... this. + * testsuite/libgomp.oacc-c/lib-58.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-58.c: ... this. + * testsuite/libgomp.oacc-c/lib-59.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-59.c: ... this. + * testsuite/libgomp.oacc-c/lib-6.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-6.c: ... this. + * testsuite/libgomp.oacc-c/lib-60.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-60.c: ... this. + * testsuite/libgomp.oacc-c/lib-61.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-61.c: ... this. + * testsuite/libgomp.oacc-c/lib-62.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-62.c: ... this. + * testsuite/libgomp.oacc-c/lib-63.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-63.c: ... this. + * testsuite/libgomp.oacc-c/lib-64.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-64.c: ... this. + * testsuite/libgomp.oacc-c/lib-65.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-65.c: ... this. + * testsuite/libgomp.oacc-c/lib-66.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-66.c: ... this. + * testsuite/libgomp.oacc-c/lib-67.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-67.c: ... this. + * testsuite/libgomp.oacc-c/lib-68.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-68.c: ... this. + * testsuite/libgomp.oacc-c/lib-69.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-69.c: ... this. + * testsuite/libgomp.oacc-c/lib-7.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-7.c: ... this. + * testsuite/libgomp.oacc-c/lib-70.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-70.c: ... this. + * testsuite/libgomp.oacc-c/lib-71.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-71.c: ... this. + * testsuite/libgomp.oacc-c/lib-72.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-72.c: ... this. + * testsuite/libgomp.oacc-c/lib-73.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-73.c: ... this. + * testsuite/libgomp.oacc-c/lib-74.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-74.c: ... this. + * testsuite/libgomp.oacc-c/lib-75.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-75.c: ... this. + * testsuite/libgomp.oacc-c/lib-76.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-76.c: ... this. + * testsuite/libgomp.oacc-c/lib-77.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-77.c: ... this. + * testsuite/libgomp.oacc-c/lib-78.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-78.c: ... this. + * testsuite/libgomp.oacc-c/lib-79.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-79.c: ... this. + * testsuite/libgomp.oacc-c/lib-80.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-80.c: ... this. + * testsuite/libgomp.oacc-c/lib-81.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-81.c: ... this. + * testsuite/libgomp.oacc-c/lib-82.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-82.c: ... this. + * testsuite/libgomp.oacc-c/lib-83.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-83.c: ... this. + * testsuite/libgomp.oacc-c/lib-84.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-84.c: ... this. + * testsuite/libgomp.oacc-c/lib-85.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-85.c: ... this. + * testsuite/libgomp.oacc-c/lib-86.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-86.c: ... this. + * testsuite/libgomp.oacc-c/lib-87.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-87.c: ... this. + * testsuite/libgomp.oacc-c/lib-88.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-88.c: ... this. + * testsuite/libgomp.oacc-c/lib-89.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-89.c: ... this. + * testsuite/libgomp.oacc-c/lib-9.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-9.c: ... this. + * testsuite/libgomp.oacc-c/lib-90.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-90.c: ... this. + * testsuite/libgomp.oacc-c/lib-91.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-91.c: ... this. + * testsuite/libgomp.oacc-c/lib-92.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/lib-92.c: ... this. + * testsuite/libgomp.oacc-c/nested-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/nested-1.c: ... this. + * testsuite/libgomp.oacc-c/nested-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/nested-2.c: ... this. + * testsuite/libgomp.oacc-c/offset-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/offset-1.c: ... this. + * testsuite/libgomp.oacc-c/parallel-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/parallel-1.c: ... this. + * testsuite/libgomp.oacc-c/pointer-align-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/pointer-align-1.c: ... this. + * testsuite/libgomp.oacc-c/present-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/present-1.c: ... this. + * testsuite/libgomp.oacc-c/present-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/present-2.c: ... this. + * testsuite/libgomp.oacc-c/reduction-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-1.c: ... this. + * testsuite/libgomp.oacc-c/reduction-2.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-2.c: ... this. + * testsuite/libgomp.oacc-c/reduction-3.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-3.c: ... this. + * testsuite/libgomp.oacc-c/reduction-4.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-4.c: ... this. + * testsuite/libgomp.oacc-c/reduction-5.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-5.c: ... this. + * testsuite/libgomp.oacc-c/reduction-initial-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/reduction-initial-1.c: ... this. + * testsuite/libgomp.oacc-c/subr.cu: Rename to... + * testsuite/libgomp.oacc-c-c++-common/subr.cu: ... this. + * testsuite/libgomp.oacc-c/subr.ptx: Rename to... + * testsuite/libgomp.oacc-c-c++-common/subr.ptx: ... this. + * testsuite/libgomp.oacc-c/timer.h: Rename to... + * testsuite/libgomp.oacc-c-c++-common/timer.h: ... this. + * testsuite/libgomp.oacc-c/update-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/update-1.c: ... this. * libgomp.texi: Update for OpenACC. diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index 3b64da73377..9d5bf0b7fd4 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -24,6 +24,11 @@ dg-init # XXX (TEMPORARY): Remove the -flto once that's properly integrated. lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +# TODO. Switch into C++ mode. Otherwise, the libgomp.oacc-c-c++-common/*.c +# files would be compiled as C files. +set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST" +set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++" + set blddir [lookfor_file [get_multilibs] libgomp] @@ -49,7 +54,9 @@ if { $blddir != "" } { if { $lang_test_file_found } { # Gather a list of all tests. - set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] + set tests [lsort [concat \ + [find $srcdir/$subdir *.C] \ + [find $srcdir/$subdir/../libgomp.oacc-c-c++-common *.c]]] if { $blddir != "" } { set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" @@ -85,6 +92,12 @@ if { $lang_test_file_found } { set acc_mem_shared 0 } nvidia { + # Copy ptx file (TEMPORARY) + remote_download host $srcdir/libgomp.oacc-c-c++-common/subr.ptx + + # Where timer.h lives + lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/libgomp.oacc-c-c++-common" + set acc_mem_shared 0 } default { @@ -100,5 +113,8 @@ if { $lang_test_file_found } { } } +# TODO. See above. +set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST" + # All done. dg-finish diff --git a/libgomp/testsuite/libgomp.oacc-c/abort-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/abort-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/abort-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/abort.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/abort.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/abort.c diff --git a/libgomp/testsuite/libgomp.oacc-c/acc_on_device-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/acc_on_device-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/acc_on_device-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/clauses-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/clauses-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/clauses-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/clauses-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/context-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/context-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/context-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/context-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/context-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/context-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/context-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/context-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/context-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/context-3.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/context-3.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/context-3.c diff --git a/libgomp/testsuite/libgomp.oacc-c/context-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/context-4.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/context-4.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/context-4.c diff --git a/libgomp/testsuite/libgomp.oacc-c/data-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/data-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/data-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/data-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/data-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/data-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/data-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-3.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/data-3.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/data-3.c diff --git a/libgomp/testsuite/libgomp.oacc-c/deviceptr-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/deviceptr-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/deviceptr-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/if-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/if-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/if-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/if-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/kernels-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/kernels-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-10.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-10.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-11.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-11.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-12.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-12.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-12.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-12.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-13.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-13.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-13.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-13.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-14.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-14.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-14.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-14.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-15.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-15.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-15.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-15.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-16.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-16.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-17.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-17.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-18.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-18.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-19.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-19.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-19.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-19.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-20.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-20.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-21.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-21.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-22.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-22.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-23.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-23.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-24.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-24.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-24.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-24.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-25.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-25.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-26.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-26.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-27.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-27.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-28.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-28.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-29.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-29.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-3.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-30.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-30.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-31.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-31.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-31.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-31.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-32.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-32.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-32.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-33.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-33.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-33.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-33.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-34.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-34.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-35.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-35.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-36.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-36.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-37.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-37.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-37.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-37.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-38.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-38.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-38.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-38.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-39.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-39.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-4.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-40.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-40.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-41.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-41.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-41.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-41.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-42.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-42.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-43.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-43.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-44.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-44.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-45.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-45.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-45.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-45.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-46.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-46.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-46.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-46.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-47.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-47.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-48.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-48.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-49.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-49.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-49.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-49.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-5.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-5.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-5.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-50.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-50.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-50.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-50.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-51.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-51.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-51.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-51.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-52.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-52.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-53.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-53.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-54.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-54.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-55.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-55.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-55.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-55.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-56.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-56.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-56.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-56.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-57.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-57.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-58.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-58.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-59.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-59.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-59.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-59.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-6.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-6.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-6.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-6.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-60.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-60.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-60.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-60.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-61.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-61.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-61.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-61.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-62.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-62.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-63.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-63.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-64.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-64.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-65.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-65.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-66.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-66.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-66.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-66.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-67.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-67.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-68.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-68.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-69.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-69.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-69.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-69.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-7.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-7.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-7.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-7.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-70.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-70.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-70.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-70.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-71.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-71.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-72.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-72.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-72.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-72.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-73.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-73.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-73.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-73.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-74.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-74.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-74.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-74.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-75.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-75.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-75.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-75.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-76.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-76.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-76.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-76.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-77.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-77.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-78.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-78.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-78.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-78.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-79.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-79.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-79.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-79.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-80.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-80.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-81.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-81.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-81.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-81.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-82.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-82.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-82.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-82.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-83.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-83.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-83.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-83.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-84.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-84.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-84.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-84.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-85.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-85.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-85.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-85.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-86.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-86.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-86.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-86.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-87.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-87.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-87.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-87.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-88.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-88.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-88.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-88.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-89.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-89.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-89.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-89.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-9.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-9.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-90.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-90.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-90.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-90.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-91.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-91.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-91.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-91.c diff --git a/libgomp/testsuite/libgomp.oacc-c/lib-92.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-92.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/lib-92.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/lib-92.c diff --git a/libgomp/testsuite/libgomp.oacc-c/nested-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/nested-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/nested-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/nested-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/nested-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/nested-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/nested-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/nested-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/offset-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/offset-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/offset-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/offset-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/parallel-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/parallel-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/pointer-align-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pointer-align-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/pointer-align-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/pointer-align-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/present-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/present-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/present-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/present-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/present-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/present-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-2.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-3.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-4.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-5.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c diff --git a/libgomp/testsuite/libgomp.oacc-c/reduction-initial-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-initial-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/reduction-initial-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-initial-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/subr.cu b/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.cu similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/subr.cu rename to libgomp/testsuite/libgomp.oacc-c-c++-common/subr.cu diff --git a/libgomp/testsuite/libgomp.oacc-c/subr.ptx b/libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/subr.ptx rename to libgomp/testsuite/libgomp.oacc-c-c++-common/subr.ptx diff --git a/libgomp/testsuite/libgomp.oacc-c/timer.h b/libgomp/testsuite/libgomp.oacc-c-c++-common/timer.h similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/timer.h rename to libgomp/testsuite/libgomp.oacc-c-c++-common/timer.h diff --git a/libgomp/testsuite/libgomp.oacc-c/update-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/update-1.c similarity index 100% rename from libgomp/testsuite/libgomp.oacc-c/update-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/update-1.c diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp index 7559afa18a5..0c3144732fa 100644 --- a/libgomp/testsuite/libgomp.oacc-c/c.exp +++ b/libgomp/testsuite/libgomp.oacc-c/c.exp @@ -31,7 +31,9 @@ dg-init lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" # Gather a list of all tests. -set tests [lsort [find $srcdir/$subdir *.c]] +set tests [lsort [concat \ + [find $srcdir/$subdir *.c] \ + [find $srcdir/$subdir/../libgomp.oacc-c-c++-common *.c]]] set ld_library_path $always_ld_library_path append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] @@ -59,10 +61,11 @@ foreach accel $accels { } nvidia { # Copy ptx file (TEMPORARY) - remote_download host $srcdir/libgomp.oacc-c/subr.ptx + remote_download host $srcdir/libgomp.oacc-c-c++-common/subr.ptx # Where timer.h lives - lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}" + lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/libgomp.oacc-c-c++-common" + set acc_mem_shared 0 } default { -- 2.11.4.GIT