[gomp4] libgomp testsuite: OpenACC C++ testing (was: [2/3] OpenACC 2.0 support for libgomp - new tests)

diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp
index d4cde2f..8dc947d 100644
--- libgomp/ChangeLog.gomp
+++ libgomp/ChangeLog.gomp
@@ -1,4 +1,255 @@ 
 2014-11-05  Thomas Schwinge  <thomas@codesourcery.com>
+	    James Norris  <jnorris@codesourcery.com>
+
+	* 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 libgomp/testsuite/libgomp.oacc-c++/c++.exp libgomp/testsuite/libgomp.oacc-c++/c++.exp
index 3b64da7..9d5bf0b 100644
--- libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ 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 libgomp/testsuite/libgomp.oacc-c/abort-2.c 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 libgomp/testsuite/libgomp.oacc-c/abort.c 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 libgomp/testsuite/libgomp.oacc-c/acc_on_device-1.c 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 libgomp/testsuite/libgomp.oacc-c/clauses-1.c 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 libgomp/testsuite/libgomp.oacc-c/clauses-2.c 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 libgomp/testsuite/libgomp.oacc-c/context-1.c 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 libgomp/testsuite/libgomp.oacc-c/context-2.c 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 libgomp/testsuite/libgomp.oacc-c/context-3.c 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 libgomp/testsuite/libgomp.oacc-c/context-4.c 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 libgomp/testsuite/libgomp.oacc-c/data-1.c 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 libgomp/testsuite/libgomp.oacc-c/data-2.c 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 libgomp/testsuite/libgomp.oacc-c/data-3.c 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 libgomp/testsuite/libgomp.oacc-c/deviceptr-1.c 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 libgomp/testsuite/libgomp.oacc-c/if-1.c 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 libgomp/testsuite/libgomp.oacc-c/kernels-1.c 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 libgomp/testsuite/libgomp.oacc-c/lib-1.c 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 libgomp/testsuite/libgomp.oacc-c/lib-10.c 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 libgomp/testsuite/libgomp.oacc-c/lib-11.c 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 libgomp/testsuite/libgomp.oacc-c/lib-12.c 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 libgomp/testsuite/libgomp.oacc-c/lib-13.c 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 libgomp/testsuite/libgomp.oacc-c/lib-14.c 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 libgomp/testsuite/libgomp.oacc-c/lib-15.c 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 libgomp/testsuite/libgomp.oacc-c/lib-16.c 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 libgomp/testsuite/libgomp.oacc-c/lib-17.c 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 libgomp/testsuite/libgomp.oacc-c/lib-18.c 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 libgomp/testsuite/libgomp.oacc-c/lib-19.c 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 libgomp/testsuite/libgomp.oacc-c/lib-2.c 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 libgomp/testsuite/libgomp.oacc-c/lib-20.c 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 libgomp/testsuite/libgomp.oacc-c/lib-21.c 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 libgomp/testsuite/libgomp.oacc-c/lib-22.c 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 libgomp/testsuite/libgomp.oacc-c/lib-23.c 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 libgomp/testsuite/libgomp.oacc-c/lib-24.c 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 libgomp/testsuite/libgomp.oacc-c/lib-25.c 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 libgomp/testsuite/libgomp.oacc-c/lib-26.c 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 libgomp/testsuite/libgomp.oacc-c/lib-27.c 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 libgomp/testsuite/libgomp.oacc-c/lib-28.c 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 libgomp/testsuite/libgomp.oacc-c/lib-29.c 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 libgomp/testsuite/libgomp.oacc-c/lib-3.c 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 libgomp/testsuite/libgomp.oacc-c/lib-30.c 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 libgomp/testsuite/libgomp.oacc-c/lib-31.c 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 libgomp/testsuite/libgomp.oacc-c/lib-32.c 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 libgomp/testsuite/libgomp.oacc-c/lib-33.c 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 libgomp/testsuite/libgomp.oacc-c/lib-34.c 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 libgomp/testsuite/libgomp.oacc-c/lib-35.c 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 libgomp/testsuite/libgomp.oacc-c/lib-36.c 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 libgomp/testsuite/libgomp.oacc-c/lib-37.c 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 libgomp/testsuite/libgomp.oacc-c/lib-38.c 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 libgomp/testsuite/libgomp.oacc-c/lib-39.c 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 libgomp/testsuite/libgomp.oacc-c/lib-4.c 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 libgomp/testsuite/libgomp.oacc-c/lib-40.c 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 libgomp/testsuite/libgomp.oacc-c/lib-41.c 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 libgomp/testsuite/libgomp.oacc-c/lib-42.c 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 libgomp/testsuite/libgomp.oacc-c/lib-43.c 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 libgomp/testsuite/libgomp.oacc-c/lib-44.c 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 libgomp/testsuite/libgomp.oacc-c/lib-45.c 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 libgomp/testsuite/libgomp.oacc-c/lib-46.c 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 libgomp/testsuite/libgomp.oacc-c/lib-47.c 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 libgomp/testsuite/libgomp.oacc-c/lib-48.c 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 libgomp/testsuite/libgomp.oacc-c/lib-49.c 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 libgomp/testsuite/libgomp.oacc-c/lib-5.c 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 libgomp/testsuite/libgomp.oacc-c/lib-50.c 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 libgomp/testsuite/libgomp.oacc-c/lib-51.c 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 libgomp/testsuite/libgomp.oacc-c/lib-52.c 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 libgomp/testsuite/libgomp.oacc-c/lib-53.c 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 libgomp/testsuite/libgomp.oacc-c/lib-54.c 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 libgomp/testsuite/libgomp.oacc-c/lib-55.c 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 libgomp/testsuite/libgomp.oacc-c/lib-56.c 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 libgomp/testsuite/libgomp.oacc-c/lib-57.c 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 libgomp/testsuite/libgomp.oacc-c/lib-58.c 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 libgomp/testsuite/libgomp.oacc-c/lib-59.c 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 libgomp/testsuite/libgomp.oacc-c/lib-6.c 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 libgomp/testsuite/libgomp.oacc-c/lib-60.c 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 libgomp/testsuite/libgomp.oacc-c/lib-61.c 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 libgomp/testsuite/libgomp.oacc-c/lib-62.c 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 libgomp/testsuite/libgomp.oacc-c/lib-63.c 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 libgomp/testsuite/libgomp.oacc-c/lib-64.c 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 libgomp/testsuite/libgomp.oacc-c/lib-65.c 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 libgomp/testsuite/libgomp.oacc-c/lib-66.c 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 libgomp/testsuite/libgomp.oacc-c/lib-67.c 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 libgomp/testsuite/libgomp.oacc-c/lib-68.c 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 libgomp/testsuite/libgomp.oacc-c/lib-69.c 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 libgomp/testsuite/libgomp.oacc-c/lib-7.c 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 libgomp/testsuite/libgomp.oacc-c/lib-70.c 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 libgomp/testsuite/libgomp.oacc-c/lib-71.c 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 libgomp/testsuite/libgomp.oacc-c/lib-72.c 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 libgomp/testsuite/libgomp.oacc-c/lib-73.c 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 libgomp/testsuite/libgomp.oacc-c/lib-74.c 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 libgomp/testsuite/libgomp.oacc-c/lib-75.c 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 libgomp/testsuite/libgomp.oacc-c/lib-76.c 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 libgomp/testsuite/libgomp.oacc-c/lib-77.c 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 libgomp/testsuite/libgomp.oacc-c/lib-78.c 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 libgomp/testsuite/libgomp.oacc-c/lib-79.c 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 libgomp/testsuite/libgomp.oacc-c/lib-80.c 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 libgomp/testsuite/libgomp.oacc-c/lib-81.c 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 libgomp/testsuite/libgomp.oacc-c/lib-82.c 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 libgomp/testsuite/libgomp.oacc-c/lib-83.c 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 libgomp/testsuite/libgomp.oacc-c/lib-84.c 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 libgomp/testsuite/libgomp.oacc-c/lib-85.c 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 libgomp/testsuite/libgomp.oacc-c/lib-86.c 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 libgomp/testsuite/libgomp.oacc-c/lib-87.c 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 libgomp/testsuite/libgomp.oacc-c/lib-88.c 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 libgomp/testsuite/libgomp.oacc-c/lib-89.c 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 libgomp/testsuite/libgomp.oacc-c/lib-9.c 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 libgomp/testsuite/libgomp.oacc-c/lib-90.c 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 libgomp/testsuite/libgomp.oacc-c/lib-91.c 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 libgomp/testsuite/libgomp.oacc-c/lib-92.c 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 libgomp/testsuite/libgomp.oacc-c/nested-1.c 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 libgomp/testsuite/libgomp.oacc-c/nested-2.c 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 libgomp/testsuite/libgomp.oacc-c/offset-1.c 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 libgomp/testsuite/libgomp.oacc-c/parallel-1.c 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 libgomp/testsuite/libgomp.oacc-c/pointer-align-1.c 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 libgomp/testsuite/libgomp.oacc-c/present-1.c 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 libgomp/testsuite/libgomp.oacc-c/present-2.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-1.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-2.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-3.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-4.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-5.c 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 libgomp/testsuite/libgomp.oacc-c/reduction-initial-1.c 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 libgomp/testsuite/libgomp.oacc-c/subr.cu 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 libgomp/testsuite/libgomp.oacc-c/subr.ptx 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 libgomp/testsuite/libgomp.oacc-c/timer.h 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 libgomp/testsuite/libgomp.oacc-c/update-1.c 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 libgomp/testsuite/libgomp.oacc-c/c.exp libgomp/testsuite/libgomp.oacc-c/c.exp
index 7559afa..0c31447 100644
--- libgomp/testsuite/libgomp.oacc-c/c.exp
+++ 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 {