diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 669f9f1e59f..fd81fa3089f 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,141 @@
+2018-05-02  Tom de Vries  <tom@codesourcery.com>
+
+	PR testsuite/83791
+	* testsuite/libgomp.c++/udr-9.C: Update.
+	* testsuite/libgomp.c++/atomic-16.C: Remove.
+	* testsuite/libgomp.c++/cancel-taskgroup-2.C: Remove.
+	* testsuite/libgomp.c++/loop-13.C: Remove.
+	* testsuite/libgomp.c++/loop-14.C: Remove.
+	* testsuite/libgomp.c++/loop-15.C: Remove.
+	* testsuite/libgomp.c++/monotonic-1.C: Remove.
+	* testsuite/libgomp.c++/monotonic-2.C: Remove.
+	* testsuite/libgomp.c++/nonmonotonic-1.C: Remove.
+	* testsuite/libgomp.c++/nonmonotonic-2.C: Remove.
+	* testsuite/libgomp.c++/ordered-1.C: Remove.
+	* testsuite/libgomp.c++/pr45784.C: Remove.
+	* testsuite/libgomp.c++/pr64824.C: Remove.
+	* testsuite/libgomp.c++/pr64868.C: Remove.
+	* testsuite/libgomp.c++/pr66199-1.C: Remove.
+	* testsuite/libgomp.c++/pr66199-2.C: Remove.
+	* testsuite/libgomp.c++/pr66199-3.C: Remove.
+	* testsuite/libgomp.c++/pr66199-4.C: Remove.
+	* testsuite/libgomp.c++/pr66199-5.C: Remove.
+	* testsuite/libgomp.c++/pr66199-6.C: Remove.
+	* testsuite/libgomp.c++/pr66199-7.C: Remove.
+	* testsuite/libgomp.c++/pr66199-8.C: Remove.
+	* testsuite/libgomp.c++/pr66199-9.C: Remove.
+	* testsuite/libgomp.c++/pr69389.C: Remove.
+	* testsuite/libgomp.c++/simd10.C: Remove.
+	* testsuite/libgomp.c++/simd11.C: Remove.
+	* testsuite/libgomp.c++/simd12.C: Remove.
+	* testsuite/libgomp.c++/simd13.C: Remove.
+	* testsuite/libgomp.c++/target-1.C: Remove.
+	* testsuite/libgomp.c++/target-3.C: Remove.
+	* testsuite/libgomp.c++/target-4.C: Remove.
+	* testsuite/libgomp.c++/target-5.C: Remove.
+	* testsuite/libgomp.c++/taskgroup-1.C: Remove.
+	* testsuite/libgomp.c++/taskloop-1.C: Remove.
+	* testsuite/libgomp.c++/taskloop-2.C: Remove.
+	* testsuite/libgomp.c++/taskloop-3.C: Remove.
+	* testsuite/libgomp.c++/taskloop-4.C: Remove.
+	* testsuite/libgomp.c++/udr-9.C: Remove.
+	* testsuite/libgomp.c++/for-10.C: Remove.
+	* testsuite/libgomp.c++/for-11.C: Remove.
+	* testsuite/libgomp.c++/for-12.C: Remove.
+	* testsuite/libgomp.c++/for-13.C: Remove.
+	* testsuite/libgomp.c++/for-14.C: Remove.
+	* testsuite/libgomp.c++/for-9.C: Remove.
+	* testsuite/libgomp.c/atomic-18.c: Move ...
+	* testsuite/libgomp.c-c++-common/atomic-18.c: ... here.
+	* testsuite/libgomp.c/cancel-taskgroup-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/cancel-taskgroup-2.c: here.
+	* testsuite/libgomp.c/loop-13.c: Move ...
+	* testsuite/libgomp.c-c++-common/loop-13.c: ... here.
+	* testsuite/libgomp.c/loop-14.c: Move ...
+	* testsuite/libgomp.c-c++-common/loop-14.c: ... here.
+	* testsuite/libgomp.c/loop-15.c: Remove.
+	* testsuite/libgomp.c-c++-common/loop-15.c: New test.
+	* testsuite/libgomp.c/monotonic-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/monotonic-1.c: ... here.
+	* testsuite/libgomp.c/monotonic-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/monotonic-2.c: ... here.
+	* testsuite/libgomp.c/nonmonotonic-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/nonmonotonic-1.c: ... here.
+	* testsuite/libgomp.c/nonmonotonic-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/nonmonotonic-2.c: ... here.
+	* testsuite/libgomp.c/ordered-4.c: Move ...
+	* testsuite/libgomp.c-c++-common/ordered-4.c: ... here.
+	* testsuite/libgomp.c/pr45784.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr45784.c: ... here.
+	* testsuite/libgomp.c/pr64824.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr64824.c: ... here.
+	* testsuite/libgomp.c/pr64868.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr64868.c: ... here.
+	* testsuite/libgomp.c/pr66199-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-1.c: ... here.
+	* testsuite/libgomp.c/pr66199-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-2.c: ... here.
+	* testsuite/libgomp.c/pr66199-3.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-3.c: ... here.
+	* testsuite/libgomp.c/pr66199-4.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-4.c: ... here.
+	* testsuite/libgomp.c/pr66199-5.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-5.c: ... here.
+	* testsuite/libgomp.c/pr66199-6.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-6.c: ... here.
+	* testsuite/libgomp.c/pr66199-7.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-7.c: ... here.
+	* testsuite/libgomp.c/pr66199-8.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-8.c: ... here.
+	* testsuite/libgomp.c/pr66199-9.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr66199-9.c: ... here.
+	* testsuite/libgomp.c/pr69389.c: Move ...
+	* testsuite/libgomp.c-c++-common/pr69389.c: ... here.
+	* testsuite/libgomp.c/simd-14.c: Move ...
+	* testsuite/libgomp.c-c++-common/simd-14.c: ... here.
+	* testsuite/libgomp.c/simd-15.c: Move ...
+	* testsuite/libgomp.c-c++-common/simd-15.c: ... here.
+	* testsuite/libgomp.c/simd-16.c: Move ...
+	* testsuite/libgomp.c-c++-common/simd-16.c: ... here.
+	* testsuite/libgomp.c/simd-17.c: Move ...
+	* testsuite/libgomp.c-c++-common/simd-17.c: ... here.
+	* testsuite/libgomp.c/target-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/target-1.c: ... here.
+	* testsuite/libgomp.c/target-10.c: Move ...
+	* testsuite/libgomp.c-c++-common/target-10.c: ... here.
+	* testsuite/libgomp.c/target-13.c: Move ...
+	* testsuite/libgomp.c-c++-common/target-13.c: ... here.
+	* testsuite/libgomp.c/target-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/target-2.c: ... here.
+	* testsuite/libgomp.c/taskgroup-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/taskgroup-1.c: ... here.
+	* testsuite/libgomp.c/taskloop-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/taskloop-1.c: ... here.
+	* testsuite/libgomp.c/taskloop-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/taskloop-2.c: ... here.
+	* testsuite/libgomp.c/taskloop-3.c: Move ...
+	* testsuite/libgomp.c-c++-common/taskloop-3.c: ... here.
+	* testsuite/libgomp.c/taskloop-4.c: Move ...
+	* testsuite/libgomp.c-c++-common/taskloop-4.c: ... here.
+	* testsuite/libgomp.c/udr-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/udr-1.c: ... here.
+	* testsuite/libgomp.c/for-1.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-1.c: ... here.
+	* testsuite/libgomp.c/for-1.h: Move ...
+	* testsuite/libgomp.c-c++-common/for-1.h: ... here.
+	* testsuite/libgomp.c/for-2.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-2.c: ... here.
+	* testsuite/libgomp.c/for-2.h: Move ...
+	* testsuite/libgomp.c-c++-common/for-2.h: ... here.
+	* testsuite/libgomp.c/for-3.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-3.c: ... here.
+	* testsuite/libgomp.c/for-4.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-4.c: ... here.
+	* testsuite/libgomp.c/for-5.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-5.c: ... here.
+	* testsuite/libgomp.c/for-6.c: Move ...
+	* testsuite/libgomp.c-c++-common/for-6.c: ... here.
+
 2018-05-02  Tom de Vries  <tom@codesourcery.com>
 
 	PR libgomp/82428
diff --git a/libgomp/testsuite/libgomp.c++/atomic-16.C b/libgomp/testsuite/libgomp.c++/atomic-16.C
deleted file mode 100644
index 432d36dd7da..00000000000
--- a/libgomp/testsuite/libgomp.c++/atomic-16.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR c/64824
-// { dg-do run }
-
-#include "../libgomp.c/atomic-18.c"
diff --git a/libgomp/testsuite/libgomp.c++/cancel-taskgroup-2.C b/libgomp/testsuite/libgomp.c++/cancel-taskgroup-2.C
deleted file mode 100644
index d4a02e91140..00000000000
--- a/libgomp/testsuite/libgomp.c++/cancel-taskgroup-2.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do run }
-// { dg-set-target-env-var OMP_CANCELLATION "true" }
-
-#include "../libgomp.c/cancel-taskgroup-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/for-10.C b/libgomp/testsuite/libgomp.c++/for-10.C
deleted file mode 100644
index c67096ac92a..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-10.C
+++ /dev/null
@@ -1,47 +0,0 @@
-extern "C" void abort ();
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#define F simd
-#define G simd
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F parallel for simd
-#define G pf_simd
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#undef SC
-#define SC static
-#define F for simd
-#define G f_simd
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-#undef SC
-
-int
-main ()
-{
-  if (test_simd_normal ()
-      || test_pf_simd_static ()
-      || test_pf_simd_static32 ()
-      || test_pf_simd_auto ()
-      || test_pf_simd_guided32 ()
-      || test_pf_simd_runtime ()
-      || test_f_simd_static ()
-      || test_f_simd_static32 ()
-      || test_f_simd_auto ()
-      || test_f_simd_guided32 ()
-      || test_f_simd_runtime ())
-    abort ();
-  return 0;
-}
diff --git a/libgomp/testsuite/libgomp.c++/for-11.C b/libgomp/testsuite/libgomp.c++/for-11.C
deleted file mode 100644
index 0244e4de112..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-11.C
+++ /dev/null
@@ -1,108 +0,0 @@
-extern "C" void abort ();
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#pragma omp declare target
-
-#define F distribute
-#define G d
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F distribute
-#define G d_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F distribute simd
-#define G ds
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F distribute simd
-#define G ds_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F distribute parallel for
-#define G dpf
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F distribute parallel for dist_schedule(static, 128)
-#define G dpf_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F distribute parallel for simd
-#define G dpfs
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F distribute parallel for simd dist_schedule(static, 128)
-#define G dpfs_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#pragma omp end declare target
-
-int
-main ()
-{
-  int err = 0;
-  #pragma omp target teams reduction(|:err)
-    {
-      err |= test_d_normal ();
-      err |= test_d_ds128_normal ();
-      err |= test_ds_normal ();
-      err |= test_ds_ds128_normal ();
-      err |= test_dpf_static ();
-      err |= test_dpf_static32 ();
-      err |= test_dpf_auto ();
-      err |= test_dpf_guided32 ();
-      err |= test_dpf_runtime ();
-      err |= test_dpf_ds128_static ();
-      err |= test_dpf_ds128_static32 ();
-      err |= test_dpf_ds128_auto ();
-      err |= test_dpf_ds128_guided32 ();
-      err |= test_dpf_ds128_runtime ();
-      err |= test_dpfs_static ();
-      err |= test_dpfs_static32 ();
-      err |= test_dpfs_auto ();
-      err |= test_dpfs_guided32 ();
-      err |= test_dpfs_runtime ();
-      err |= test_dpfs_ds128_static ();
-      err |= test_dpfs_ds128_static32 ();
-      err |= test_dpfs_ds128_auto ();
-      err |= test_dpfs_ds128_guided32 ();
-      err |= test_dpfs_ds128_runtime ();
-    }
-  if (err)
-    abort ();
-  return 0;
-}
diff --git a/libgomp/testsuite/libgomp.c++/for-12.C b/libgomp/testsuite/libgomp.c++/for-12.C
deleted file mode 100644
index 295b12f9628..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-12.C
+++ /dev/null
@@ -1,40 +0,0 @@
-extern "C" void abort (void);
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#define F taskloop
-#define G taskloop
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F taskloop simd
-#define G taskloop_simd
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-int
-main ()
-{
-  int err = 0;
-  #pragma omp parallel reduction(|:err)
-    #pragma omp single
-      {
-	if (test_taskloop_normal ()
-	    || test_taskloop_simd_normal ())
-	  err = 1;
-      }
-  if (err)
-    abort ();
-  return 0;
-}
diff --git a/libgomp/testsuite/libgomp.c++/for-13.C b/libgomp/testsuite/libgomp.c++/for-13.C
deleted file mode 100644
index ac1601a766f..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-13.C
+++ /dev/null
@@ -1,151 +0,0 @@
-extern "C" void abort ();
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#pragma omp declare target
-
-#define F for
-#define G f
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#pragma omp end declare target
-
-#undef OMPFROM
-#undef OMPTO
-#define DO_PRAGMA(x) _Pragma (#x)
-#define OMPFROM(v) DO_PRAGMA (omp target update from(v))
-#define OMPTO(v) DO_PRAGMA (omp target update to(v))
-
-#define F target parallel for
-#define G tpf
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F target simd
-#define G t_simd
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F target parallel for simd
-#define G tpf_simd
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F target teams distribute
-#define G ttd
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F target teams distribute
-#define G ttd_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F target teams distribute simd
-#define G ttds
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F target teams distribute simd
-#define G ttds_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F target teams distribute parallel for
-#define G ttdpf
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F target teams distribute parallel for dist_schedule(static, 128)
-#define G ttdpf_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F target teams distribute parallel for simd
-#define G ttdpfs
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F target teams distribute parallel for simd dist_schedule(static, 128)
-#define G ttdpfs_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-int
-main ()
-{
-  if (test_tpf_static ()
-      || test_tpf_static32 ()
-      || test_tpf_auto ()
-      || test_tpf_guided32 ()
-      || test_tpf_runtime ()
-      || test_t_simd_normal ()
-      || test_tpf_simd_static ()
-      || test_tpf_simd_static32 ()
-      || test_tpf_simd_auto ()
-      || test_tpf_simd_guided32 ()
-      || test_tpf_simd_runtime ()
-      || test_ttd_normal ()
-      || test_ttd_ds128_normal ()
-      || test_ttds_normal ()
-      || test_ttds_ds128_normal ()
-      || test_ttdpf_static ()
-      || test_ttdpf_static32 ()
-      || test_ttdpf_auto ()
-      || test_ttdpf_guided32 ()
-      || test_ttdpf_runtime ()
-      || test_ttdpf_ds128_static ()
-      || test_ttdpf_ds128_static32 ()
-      || test_ttdpf_ds128_auto ()
-      || test_ttdpf_ds128_guided32 ()
-      || test_ttdpf_ds128_runtime ()
-      || test_ttdpfs_static ()
-      || test_ttdpfs_static32 ()
-      || test_ttdpfs_auto ()
-      || test_ttdpfs_guided32 ()
-      || test_ttdpfs_runtime ()
-      || test_ttdpfs_ds128_static ()
-      || test_ttdpfs_ds128_static32 ()
-      || test_ttdpfs_ds128_auto ()
-      || test_ttdpfs_ds128_guided32 ()
-      || test_ttdpfs_ds128_runtime ())
-    abort ();
-}
diff --git a/libgomp/testsuite/libgomp.c++/for-14.C b/libgomp/testsuite/libgomp.c++/for-14.C
deleted file mode 100644
index 7738473b601..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-14.C
+++ /dev/null
@@ -1,120 +0,0 @@
-extern "C" void abort ();
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#pragma omp declare target
-
-#define F for
-#define G f
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#pragma omp end declare target
-
-#undef OMPTGT
-#undef OMPFROM
-#undef OMPTO
-#define DO_PRAGMA(x) _Pragma (#x)
-#define OMPTGT DO_PRAGMA (omp target)
-#define OMPFROM(v) DO_PRAGMA (omp target update from(v))
-#define OMPTO(v) DO_PRAGMA (omp target update to(v))
-
-#define F teams distribute
-#define G td
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F teams distribute
-#define G td_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F teams distribute simd
-#define G tds
-#define S
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F teams distribute simd
-#define G tds_ds128
-#define S dist_schedule(static, 128)
-#define N(x) M(x, G, normal)
-#include "../libgomp.c/for-2.h"
-#undef S
-#undef N
-#undef F
-#undef G
-
-#define F teams distribute parallel for
-#define G tdpf
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F teams distribute parallel for dist_schedule(static, 128)
-#define G tdpf_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F teams distribute parallel for simd
-#define G tdpfs
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F teams distribute parallel for simd dist_schedule(static, 128)
-#define G tdpfs_ds128
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-int
-main ()
-{
-  if (test_td_normal ()
-      || test_td_ds128_normal ()
-      || test_tds_normal ()
-      || test_tds_ds128_normal ()
-      || test_tdpf_static ()
-      || test_tdpf_static32 ()
-      || test_tdpf_auto ()
-      || test_tdpf_guided32 ()
-      || test_tdpf_runtime ()
-      || test_tdpf_ds128_static ()
-      || test_tdpf_ds128_static32 ()
-      || test_tdpf_ds128_auto ()
-      || test_tdpf_ds128_guided32 ()
-      || test_tdpf_ds128_runtime ()
-      || test_tdpfs_static ()
-      || test_tdpfs_static32 ()
-      || test_tdpfs_auto ()
-      || test_tdpfs_guided32 ()
-      || test_tdpfs_runtime ()
-      || test_tdpfs_ds128_static ()
-      || test_tdpfs_ds128_static32 ()
-      || test_tdpfs_ds128_auto ()
-      || test_tdpfs_ds128_guided32 ()
-      || test_tdpfs_ds128_runtime ())
-    abort ();
-}
diff --git a/libgomp/testsuite/libgomp.c++/for-9.C b/libgomp/testsuite/libgomp.c++/for-9.C
deleted file mode 100644
index 86b9d9318cb..00000000000
--- a/libgomp/testsuite/libgomp.c++/for-9.C
+++ /dev/null
@@ -1,33 +0,0 @@
-extern "C" void abort ();
-
-#define M(x, y, z) O(x, y, z)
-#define O(x, y, z) x ## _ ## y ## _ ## z
-
-#define F parallel for
-#define G pf
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-#define F for
-#define G f
-#include "../libgomp.c/for-1.h"
-#undef F
-#undef G
-
-int
-main ()
-{
-  if (test_pf_static ()
-      || test_pf_static32 ()
-      || test_pf_auto ()
-      || test_pf_guided32 ()
-      || test_pf_runtime ()
-      || test_f_static ()
-      || test_f_static32 ()
-      || test_f_auto ()
-      || test_f_guided32 ()
-      || test_f_runtime ())
-    abort ();
-  return 0;
-}
diff --git a/libgomp/testsuite/libgomp.c++/loop-13.C b/libgomp/testsuite/libgomp.c++/loop-13.C
deleted file mode 100644
index 31572be0f26..00000000000
--- a/libgomp/testsuite/libgomp.c++/loop-13.C
+++ /dev/null
@@ -1,3 +0,0 @@
-/* { dg-do run } */
-
-#include "../libgomp.c/loop-13.c"
diff --git a/libgomp/testsuite/libgomp.c++/loop-14.C b/libgomp/testsuite/libgomp.c++/loop-14.C
deleted file mode 100644
index ba2856ac105..00000000000
--- a/libgomp/testsuite/libgomp.c++/loop-14.C
+++ /dev/null
@@ -1,3 +0,0 @@
-/* { dg-do run } */
-
-#include "../libgomp.c/loop-14.c"
diff --git a/libgomp/testsuite/libgomp.c++/loop-15.C b/libgomp/testsuite/libgomp.c++/loop-15.C
deleted file mode 100644
index 9bde48e3ac8..00000000000
--- a/libgomp/testsuite/libgomp.c++/loop-15.C
+++ /dev/null
@@ -1,3 +0,0 @@
-/* { dg-do run } */
-
-#include "../libgomp.c/loop-15.c"
diff --git a/libgomp/testsuite/libgomp.c++/monotonic-1.C b/libgomp/testsuite/libgomp.c++/monotonic-1.C
deleted file mode 100644
index 464bed6b6a5..00000000000
--- a/libgomp/testsuite/libgomp.c++/monotonic-1.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/monotonic-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/monotonic-2.C b/libgomp/testsuite/libgomp.c++/monotonic-2.C
deleted file mode 100644
index 41eef0318ea..00000000000
--- a/libgomp/testsuite/libgomp.c++/monotonic-2.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/monotonic-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/nonmonotonic-1.C b/libgomp/testsuite/libgomp.c++/nonmonotonic-1.C
deleted file mode 100644
index 678e7654dfb..00000000000
--- a/libgomp/testsuite/libgomp.c++/nonmonotonic-1.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/nonmonotonic-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/nonmonotonic-2.C b/libgomp/testsuite/libgomp.c++/nonmonotonic-2.C
deleted file mode 100644
index e230875f382..00000000000
--- a/libgomp/testsuite/libgomp.c++/nonmonotonic-2.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/nonmonotonic-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/ordered-1.C b/libgomp/testsuite/libgomp.c++/ordered-1.C
deleted file mode 100644
index a1bedd808ac..00000000000
--- a/libgomp/testsuite/libgomp.c++/ordered-1.C
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libgomp.c/ordered-4.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr45784.C b/libgomp/testsuite/libgomp.c++/pr45784.C
deleted file mode 100644
index 306246c754a..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr45784.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// PR c/45784
-// { dg-do run }
-
-#include "../libgomp.c/pr45784.c"
-
diff --git a/libgomp/testsuite/libgomp.c++/pr64824.C b/libgomp/testsuite/libgomp.c++/pr64824.C
deleted file mode 100644
index 00f23bb728c..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr64824.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR c/64824
-// { dg-do run }
-
-#include "../libgomp.c/pr64824.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr64868.C b/libgomp/testsuite/libgomp.c++/pr64868.C
deleted file mode 100644
index 661ec232dd3..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr64868.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR c/64868
-// { dg-do run }
-
-#include "../libgomp.c/pr64868.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-1.C b/libgomp/testsuite/libgomp.c++/pr66199-1.C
deleted file mode 100644
index cb86a60fa26..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-1.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-2.C b/libgomp/testsuite/libgomp.c++/pr66199-2.C
deleted file mode 100644
index 1dbccb6c0e5..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-2.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-3.C b/libgomp/testsuite/libgomp.c++/pr66199-3.C
deleted file mode 100644
index 871dd44d450..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-3.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-3.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-4.C b/libgomp/testsuite/libgomp.c++/pr66199-4.C
deleted file mode 100644
index bc71a6da043..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-4.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-4.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-5.C b/libgomp/testsuite/libgomp.c++/pr66199-5.C
deleted file mode 100644
index c7549e8f424..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-5.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-5.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-6.C b/libgomp/testsuite/libgomp.c++/pr66199-6.C
deleted file mode 100644
index 46adbd721b7..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-6.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-6.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-7.C b/libgomp/testsuite/libgomp.c++/pr66199-7.C
deleted file mode 100644
index b03d284ec3d..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-7.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-7.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-8.C b/libgomp/testsuite/libgomp.c++/pr66199-8.C
deleted file mode 100644
index b998ef622c2..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-8.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-8.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr66199-9.C b/libgomp/testsuite/libgomp.c++/pr66199-9.C
deleted file mode 100644
index 1f8dfa302cf..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr66199-9.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// PR middle-end/66199
-// { dg-do run }
-
-#include "../libgomp.c/pr66199-9.c"
diff --git a/libgomp/testsuite/libgomp.c++/pr69389.C b/libgomp/testsuite/libgomp.c++/pr69389.C
deleted file mode 100644
index 9fcb0ffc6d0..00000000000
--- a/libgomp/testsuite/libgomp.c++/pr69389.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// PR c/69389
-
-#include "../libgomp.c/pr69389.c"
diff --git a/libgomp/testsuite/libgomp.c++/simd10.C b/libgomp/testsuite/libgomp.c++/simd10.C
deleted file mode 100644
index 6fab68852a4..00000000000
--- a/libgomp/testsuite/libgomp.c++/simd10.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// { dg-do run }
-// { dg-additional-options "-msse2" { target sse2_runtime } }
-// { dg-additional-options "-mavx" { target avx_runtime } }
-
-#include "../libgomp.c/simd-14.c"
diff --git a/libgomp/testsuite/libgomp.c++/simd11.C b/libgomp/testsuite/libgomp.c++/simd11.C
deleted file mode 100644
index fde22034a60..00000000000
--- a/libgomp/testsuite/libgomp.c++/simd11.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// { dg-do run }
-// { dg-additional-options "-msse2" { target sse2_runtime } }
-// { dg-additional-options "-mavx" { target avx_runtime } }
-
-#include "../libgomp.c/simd-15.c"
diff --git a/libgomp/testsuite/libgomp.c++/simd12.C b/libgomp/testsuite/libgomp.c++/simd12.C
deleted file mode 100644
index 7596cad8571..00000000000
--- a/libgomp/testsuite/libgomp.c++/simd12.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// { dg-do run }
-// { dg-additional-options "-msse2" { target sse2_runtime } }
-// { dg-additional-options "-mavx" { target avx_runtime } }
-
-#include "../libgomp.c/simd-16.c"
diff --git a/libgomp/testsuite/libgomp.c++/simd13.C b/libgomp/testsuite/libgomp.c++/simd13.C
deleted file mode 100644
index 67a0f70ff16..00000000000
--- a/libgomp/testsuite/libgomp.c++/simd13.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// { dg-do run }
-// { dg-additional-options "-msse2" { target sse2_runtime } }
-// { dg-additional-options "-mavx" { target avx_runtime } }
-
-#include "../libgomp.c/simd-17.c"
diff --git a/libgomp/testsuite/libgomp.c++/target-1.C b/libgomp/testsuite/libgomp.c++/target-1.C
deleted file mode 100644
index 3cf01d9975d..00000000000
--- a/libgomp/testsuite/libgomp.c++/target-1.C
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libgomp.c/target-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/target-3.C b/libgomp/testsuite/libgomp.c++/target-3.C
deleted file mode 100644
index 2e4586feca0..00000000000
--- a/libgomp/testsuite/libgomp.c++/target-3.C
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libgomp.c/target-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/target-4.C b/libgomp/testsuite/libgomp.c++/target-4.C
deleted file mode 100644
index 9d1b576f977..00000000000
--- a/libgomp/testsuite/libgomp.c++/target-4.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/target-10.c"
diff --git a/libgomp/testsuite/libgomp.c++/target-5.C b/libgomp/testsuite/libgomp.c++/target-5.C
deleted file mode 100644
index 6639be394c6..00000000000
--- a/libgomp/testsuite/libgomp.c++/target-5.C
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libgomp.c/target-13.c"
diff --git a/libgomp/testsuite/libgomp.c++/taskgroup-1.C b/libgomp/testsuite/libgomp.c++/taskgroup-1.C
deleted file mode 100644
index 5129896613d..00000000000
--- a/libgomp/testsuite/libgomp.c++/taskgroup-1.C
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libgomp.c/taskgroup-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/taskloop-1.C b/libgomp/testsuite/libgomp.c++/taskloop-1.C
deleted file mode 100644
index 7fc6e4652f0..00000000000
--- a/libgomp/testsuite/libgomp.c++/taskloop-1.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do run }
-// { dg-options "-O2" }
-
-#include "../libgomp.c/taskloop-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/taskloop-2.C b/libgomp/testsuite/libgomp.c++/taskloop-2.C
deleted file mode 100644
index 67a0e92717e..00000000000
--- a/libgomp/testsuite/libgomp.c++/taskloop-2.C
+++ /dev/null
@@ -1,6 +0,0 @@
-// { dg-do run }
-// { dg-options "-O2" }
-// { dg-additional-options "-msse2" { target sse2_runtime } }
-// { dg-additional-options "-mavx" { target avx_runtime } }
-
-#include "../libgomp.c/taskloop-2.c"
diff --git a/libgomp/testsuite/libgomp.c++/taskloop-3.C b/libgomp/testsuite/libgomp.c++/taskloop-3.C
deleted file mode 100644
index c08a0451f5a..00000000000
--- a/libgomp/testsuite/libgomp.c++/taskloop-3.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do run }
-// { dg-options "-O2" }
-
-#include "../libgomp.c/taskloop-3.c"
diff --git a/libgomp/testsuite/libgomp.c++/taskloop-4.C b/libgomp/testsuite/libgomp.c++/taskloop-4.C
deleted file mode 100644
index 3783717b556..00000000000
--- a/libgomp/testsuite/libgomp.c++/taskloop-4.C
+++ /dev/null
@@ -1,4 +0,0 @@
-// { dg-do run }
-// { dg-options "-O2" }
-
-#include "../libgomp.c/taskloop-4.c"
diff --git a/libgomp/testsuite/libgomp.c++/udr-19.C b/libgomp/testsuite/libgomp.c++/udr-19.C
index 40d2eb9aeed..14d2764bef7 100644
--- a/libgomp/testsuite/libgomp.c++/udr-19.C
+++ b/libgomp/testsuite/libgomp.c++/udr-19.C
@@ -1,4 +1,4 @@
 // { dg-do run }
 // { dg-additional-options "-std=c++11" }
 
-#include "udr-9.C"
+#include "../libgomp.c-c++-common/udr-1.c"
diff --git a/libgomp/testsuite/libgomp.c++/udr-9.C b/libgomp/testsuite/libgomp.c++/udr-9.C
deleted file mode 100644
index 58fea18a4ce..00000000000
--- a/libgomp/testsuite/libgomp.c++/udr-9.C
+++ /dev/null
@@ -1,3 +0,0 @@
-// { dg-do run }
-
-#include "../libgomp.c/udr-1.c"
diff --git a/libgomp/testsuite/libgomp.c/atomic-18.c b/libgomp/testsuite/libgomp.c-c++-common/atomic-18.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/atomic-18.c
rename to libgomp/testsuite/libgomp.c-c++-common/atomic-18.c
diff --git a/libgomp/testsuite/libgomp.c/cancel-taskgroup-2.c b/libgomp/testsuite/libgomp.c-c++-common/cancel-taskgroup-2.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/cancel-taskgroup-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/cancel-taskgroup-2.c
diff --git a/libgomp/testsuite/libgomp.c/for-1.c b/libgomp/testsuite/libgomp.c-c++-common/for-1.c
similarity index 82%
rename from libgomp/testsuite/libgomp.c/for-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-1.c
index 942c8e7b821..d1ebacb988e 100644
--- a/libgomp/testsuite/libgomp.c/for-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-1.c
@@ -1,6 +1,10 @@
-/* { dg-additional-options "-std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" {target c } } */
 
-extern void abort (void);
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort (void);
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/for-1.h b/libgomp/testsuite/libgomp.c-c++-common/for-1.h
similarity index 100%
rename from libgomp/testsuite/libgomp.c/for-1.h
rename to libgomp/testsuite/libgomp.c-c++-common/for-1.h
diff --git a/libgomp/testsuite/libgomp.c/for-2.c b/libgomp/testsuite/libgomp.c-c++-common/for-2.c
similarity index 87%
rename from libgomp/testsuite/libgomp.c/for-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-2.c
index e43fdb3c800..66bb233fc1b 100644
--- a/libgomp/testsuite/libgomp.c/for-2.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-2.c
@@ -1,6 +1,10 @@
-/* { dg-additional-options "-std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" { target c } } */
 
-extern void abort (void);
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort (void);
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/for-2.h b/libgomp/testsuite/libgomp.c-c++-common/for-2.h
similarity index 100%
rename from libgomp/testsuite/libgomp.c/for-2.h
rename to libgomp/testsuite/libgomp.c-c++-common/for-2.h
diff --git a/libgomp/testsuite/libgomp.c/for-3.c b/libgomp/testsuite/libgomp.c-c++-common/for-3.c
similarity index 95%
rename from libgomp/testsuite/libgomp.c/for-3.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-3.c
index f4cd115eefa..173ce8ecc13 100644
--- a/libgomp/testsuite/libgomp.c/for-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-3.c
@@ -1,6 +1,10 @@
-/* { dg-additional-options "-std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" { target c } } */
 
-extern void abort ();
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort ();
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/for-4.c b/libgomp/testsuite/libgomp.c-c++-common/for-4.c
similarity index 84%
rename from libgomp/testsuite/libgomp.c/for-4.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-4.c
index 14f900b5c43..f9c584e300c 100644
--- a/libgomp/testsuite/libgomp.c/for-4.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-4.c
@@ -1,6 +1,10 @@
-/* { dg-options "-std=gnu99" } */
+/* { dg-options "-std=gnu99" { target c } } */
 
-extern void abort (void);
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort (void);
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/for-5.c b/libgomp/testsuite/libgomp.c-c++-common/for-5.c
similarity index 96%
rename from libgomp/testsuite/libgomp.c/for-5.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-5.c
index 84e636ab0f9..edfbe13ecda 100644
--- a/libgomp/testsuite/libgomp.c/for-5.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-5.c
@@ -1,6 +1,10 @@
-/* { dg-additional-options "-std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" { target c } } */
 
-extern void abort ();
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort ();
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/for-6.c b/libgomp/testsuite/libgomp.c-c++-common/for-6.c
similarity index 95%
rename from libgomp/testsuite/libgomp.c/for-6.c
rename to libgomp/testsuite/libgomp.c-c++-common/for-6.c
index 7f3c65e82b1..64a754e51b8 100644
--- a/libgomp/testsuite/libgomp.c/for-6.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-6.c
@@ -1,6 +1,10 @@
-/* { dg-additional-options "-std=gnu99" } */
+/* { dg-additional-options "-std=gnu99" { target c } } */
 
-extern void abort ();
+extern
+#ifdef __cplusplus
+"C"
+#endif
+void abort ();
 
 #define M(x, y, z) O(x, y, z)
 #define O(x, y, z) x ## _ ## y ## _ ## z
diff --git a/libgomp/testsuite/libgomp.c/loop-13.c b/libgomp/testsuite/libgomp.c-c++-common/loop-13.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/loop-13.c
rename to libgomp/testsuite/libgomp.c-c++-common/loop-13.c
diff --git a/libgomp/testsuite/libgomp.c/loop-14.c b/libgomp/testsuite/libgomp.c-c++-common/loop-14.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/loop-14.c
rename to libgomp/testsuite/libgomp.c-c++-common/loop-14.c
diff --git a/libgomp/testsuite/libgomp.c/loop-15.c b/libgomp/testsuite/libgomp.c-c++-common/loop-15.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/loop-15.c
rename to libgomp/testsuite/libgomp.c-c++-common/loop-15.c
diff --git a/libgomp/testsuite/libgomp.c/monotonic-1.c b/libgomp/testsuite/libgomp.c-c++-common/monotonic-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/monotonic-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/monotonic-1.c
diff --git a/libgomp/testsuite/libgomp.c/monotonic-2.c b/libgomp/testsuite/libgomp.c-c++-common/monotonic-2.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/monotonic-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/monotonic-2.c
diff --git a/libgomp/testsuite/libgomp.c/nonmonotonic-1.c b/libgomp/testsuite/libgomp.c-c++-common/nonmonotonic-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/nonmonotonic-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/nonmonotonic-1.c
diff --git a/libgomp/testsuite/libgomp.c/nonmonotonic-2.c b/libgomp/testsuite/libgomp.c-c++-common/nonmonotonic-2.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/nonmonotonic-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/nonmonotonic-2.c
diff --git a/libgomp/testsuite/libgomp.c/ordered-4.c b/libgomp/testsuite/libgomp.c-c++-common/ordered-4.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/ordered-4.c
rename to libgomp/testsuite/libgomp.c-c++-common/ordered-4.c
diff --git a/libgomp/testsuite/libgomp.c/pr45784.c b/libgomp/testsuite/libgomp.c-c++-common/pr45784.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr45784.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr45784.c
diff --git a/libgomp/testsuite/libgomp.c/pr64824.c b/libgomp/testsuite/libgomp.c-c++-common/pr64824.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr64824.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr64824.c
diff --git a/libgomp/testsuite/libgomp.c/pr64868.c b/libgomp/testsuite/libgomp.c-c++-common/pr64868.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr64868.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr64868.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-1.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-1.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-2.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-2.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-2.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-3.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-3.c
similarity index 96%
rename from libgomp/testsuite/libgomp.c/pr66199-3.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-3.c
index ffe28589933..cee82e59844 100644
--- a/libgomp/testsuite/libgomp.c/pr66199-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/pr66199-3.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2" { target c } } */
 
 int u[1024], v[1024], w[1024];
 
diff --git a/libgomp/testsuite/libgomp.c/pr66199-4.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-4.c
similarity index 97%
rename from libgomp/testsuite/libgomp.c/pr66199-4.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-4.c
index 6ffa2e532bf..d6d13676f54 100644
--- a/libgomp/testsuite/libgomp.c/pr66199-4.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/pr66199-4.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2" { target c } } */
 
 #pragma omp declare target
 int u[1024], v[1024], w[1024];
diff --git a/libgomp/testsuite/libgomp.c/pr66199-5.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-5.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-5.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-5.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-6.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-6.c
similarity index 96%
rename from libgomp/testsuite/libgomp.c/pr66199-6.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-6.c
index 14f8610eb61..86467d7c726 100644
--- a/libgomp/testsuite/libgomp.c/pr66199-6.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/pr66199-6.c
@@ -1,6 +1,6 @@
 /* PR middle-end/66199 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2" { target c } } */
 
 #pragma omp declare target
 int u[1024], v[1024], w[1024];
diff --git a/libgomp/testsuite/libgomp.c/pr66199-7.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-7.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-7.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-7.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-8.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-8.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-8.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-8.c
diff --git a/libgomp/testsuite/libgomp.c/pr66199-9.c b/libgomp/testsuite/libgomp.c-c++-common/pr66199-9.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr66199-9.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr66199-9.c
diff --git a/libgomp/testsuite/libgomp.c/pr69389.c b/libgomp/testsuite/libgomp.c-c++-common/pr69389.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/pr69389.c
rename to libgomp/testsuite/libgomp.c-c++-common/pr69389.c
diff --git a/libgomp/testsuite/libgomp.c/simd-14.c b/libgomp/testsuite/libgomp.c-c++-common/simd-14.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/simd-14.c
rename to libgomp/testsuite/libgomp.c-c++-common/simd-14.c
diff --git a/libgomp/testsuite/libgomp.c/simd-15.c b/libgomp/testsuite/libgomp.c-c++-common/simd-15.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/simd-15.c
rename to libgomp/testsuite/libgomp.c-c++-common/simd-15.c
diff --git a/libgomp/testsuite/libgomp.c/simd-16.c b/libgomp/testsuite/libgomp.c-c++-common/simd-16.c
similarity index 96%
rename from libgomp/testsuite/libgomp.c/simd-16.c
rename to libgomp/testsuite/libgomp.c-c++-common/simd-16.c
index e1998e32733..ea1ca3179d3 100644
--- a/libgomp/testsuite/libgomp.c/simd-16.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/simd-16.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
-/* { dg-additional-options "-std=c99" } */
+/* { dg-additional-options "-std=c99" {target c } } */
 
 int
 main ()
diff --git a/libgomp/testsuite/libgomp.c/simd-17.c b/libgomp/testsuite/libgomp.c-c++-common/simd-17.c
similarity index 96%
rename from libgomp/testsuite/libgomp.c/simd-17.c
rename to libgomp/testsuite/libgomp.c-c++-common/simd-17.c
index b884340e419..5e543789eea 100644
--- a/libgomp/testsuite/libgomp.c/simd-17.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/simd-17.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
-/* { dg-additional-options "-std=c99" } */
+/* { dg-additional-options "-std=c99" { target c } } */
 
 static inline void
 foo (int *b, int *i, int *j, int x)
diff --git a/libgomp/testsuite/libgomp.c/target-1.c b/libgomp/testsuite/libgomp.c-c++-common/target-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/target-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/target-1.c
diff --git a/libgomp/testsuite/libgomp.c/target-10.c b/libgomp/testsuite/libgomp.c-c++-common/target-10.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/target-10.c
rename to libgomp/testsuite/libgomp.c-c++-common/target-10.c
diff --git a/libgomp/testsuite/libgomp.c/target-13.c b/libgomp/testsuite/libgomp.c-c++-common/target-13.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/target-13.c
rename to libgomp/testsuite/libgomp.c-c++-common/target-13.c
diff --git a/libgomp/testsuite/libgomp.c/target-2.c b/libgomp/testsuite/libgomp.c-c++-common/target-2.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/target-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/target-2.c
diff --git a/libgomp/testsuite/libgomp.c/taskgroup-1.c b/libgomp/testsuite/libgomp.c-c++-common/taskgroup-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/taskgroup-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/taskgroup-1.c
diff --git a/libgomp/testsuite/libgomp.c/taskloop-1.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-1.c
similarity index 89%
rename from libgomp/testsuite/libgomp.c/taskloop-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/taskloop-1.c
index edc70584c1a..11de7510b04 100644
--- a/libgomp/testsuite/libgomp.c/taskloop-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/taskloop-1.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=c99" } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-std=c99" { target c } } */
 
 int q, r, e;
 
diff --git a/libgomp/testsuite/libgomp.c/taskloop-2.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-2.c
similarity index 97%
rename from libgomp/testsuite/libgomp.c/taskloop-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/taskloop-2.c
index be893ebf80a..8387cd3073a 100644
--- a/libgomp/testsuite/libgomp.c/taskloop-2.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/taskloop-2.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=c99" } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-std=c99" { target c } } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/taskloop-3.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-3.c
similarity index 95%
rename from libgomp/testsuite/libgomp.c/taskloop-3.c
rename to libgomp/testsuite/libgomp.c-c++-common/taskloop-3.c
index 9c8c49c8da4..9650bf1c2ce 100644
--- a/libgomp/testsuite/libgomp.c/taskloop-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/taskloop-3.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -std=c99" } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-std=c99" { target c } } */
 
 int g;
 int a[1024];
diff --git a/libgomp/testsuite/libgomp.c/taskloop-4.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-4.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/taskloop-4.c
rename to libgomp/testsuite/libgomp.c-c++-common/taskloop-4.c
diff --git a/libgomp/testsuite/libgomp.c/udr-1.c b/libgomp/testsuite/libgomp.c-c++-common/udr-1.c
similarity index 100%
rename from libgomp/testsuite/libgomp.c/udr-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/udr-1.c