diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index d8e4b139349..8bb54fd7481 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -12298,6 +12298,24 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p)
 	  gimplify_omp_ctxp->loop_iter_var.quick_push (decl);
 	}
 
+      if (for_stmt == orig_for_stmt)
+	{
+	  tree orig_decl = decl;
+	  if (OMP_FOR_ORIG_DECLS (for_stmt))
+	    {
+	      tree orig_decl = TREE_VEC_ELT (OMP_FOR_ORIG_DECLS (for_stmt), i);
+	      if (TREE_CODE (orig_decl) == TREE_LIST)
+		{
+		  orig_decl = TREE_PURPOSE (orig_decl);
+		  if (!orig_decl)
+		    orig_decl = decl;
+		}
+	    }
+	  if (is_global_var (orig_decl) && DECL_THREAD_LOCAL_P (orig_decl))
+	    error_at (EXPR_LOCATION (for_stmt),
+		      "threadprivate iteration variable %qD", orig_decl);
+	}
+
       /* Make sure the iteration variable is private.  */
       tree c = NULL_TREE;
       tree c2 = NULL_TREE;
diff --git a/gcc/testsuite/c-c++-common/gomp/loop-10.c b/gcc/testsuite/c-c++-common/gomp/loop-10.c
new file mode 100644
index 00000000000..1229e61e824
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/loop-10.c
@@ -0,0 +1,35 @@
+int a, b;
+#pragma omp threadprivate (a, b)
+
+void
+foo (void)
+{
+  #pragma omp for				/* { dg-error "threadprivate iteration variable 'a'" } */
+  for (a = 0; a < 32; a++)
+    ;
+  #pragma omp parallel for collapse(2)		/* { dg-error "threadprivate iteration variable 'a'" "" { target c } } */
+  for (a = 0; a < 32; a++)			/* { dg-error "threadprivate iteration variable 'b'" "" { target c } .-1 } */
+    for (b = 0; b < 32; b++)			/* { dg-error "threadprivate iteration variable 'a'" "" { target c++ } .-1 } */
+      ;						/* { dg-error "threadprivate iteration variable 'b'" "" { target c++ } .-2 } */
+  #pragma omp simd				/* { dg-error "threadprivate iteration variable 'a'" } */
+  for (a = 0; a < 32; a++)
+    ;
+  #pragma omp taskloop				/* { dg-error "threadprivate iteration variable 'a'" } */
+  for (a = 0; a < 32; a++)
+    ;
+  #pragma omp loop bind(thread)			/* { dg-error "threadprivate iteration variable 'a'" } */
+  for (a = 0; a < 32; a++)
+    ;
+}
+
+void
+bar (void)
+{
+  #pragma omp distribute collapse(2)		/* { dg-error "threadprivate iteration variable 'a'" } */
+  for (a = 0; a < 32; a++)			/* { dg-error "threadprivate iteration variable 'b'" "" { target *-*-* } .-1 } */
+    for (b = 0; b < a; b++)
+      ;
+  #pragma omp distribute parallel for simd	/* { dg-error "threadprivate iteration variable 'a'" "" { target c } } */
+  for (a = 0; a < 32; a++)			/* { dg-error "threadprivate iteration variable 'a'" "" { target c++ } } */
+    ;
+}