* trans-decl.c (get_proc_pointer_decl): Set DECL_TLS_MODEL

	if threadprivate.
	* symbol.c (check_conflict): Allow threadprivate attribute with
	FL_PROCEDURE if proc_pointer.

	* testsuite/libgomp.fortran/threadprivate4.f90: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178114 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 78 insertions, 0 deletions

diff --git a/libgomp/testsuite/libgomp.fortran/threadprivate4.f90 b/libgomp/testsuite/libgomp.fortran/threadprivate4.f90
new file mode 100644
index 00000000000..b5fb10bfee7
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/threadprivate4.f90
@@ -0,0 +1,78 @@
+! { dg-do run }
+! { dg-require-effective-target tls_runtime }
+
+module threadprivate4
+  integer :: vi
+  procedure(), pointer :: foo
+!$omp threadprivate (foo, vi)
+
+contains
+  subroutine fn0
+    vi = 0
+  end subroutine fn0
+  subroutine fn1
+    vi = 1
+  end subroutine fn1
+  subroutine fn2
+    vi = 2
+  end subroutine fn2
+  subroutine fn3
+    vi = 3
+  end subroutine fn3
+end module threadprivate4
+
+  use omp_lib
+  use threadprivate4
+
+  integer :: i
+  logical :: l
+
+  procedure(), pointer :: bar1
+  common /thrc/ bar1
+!$omp threadprivate (/thrc/)
+
+  procedure(), pointer, save :: bar2
+!$omp threadprivate (bar2)
+
+  l = .false.
+  call omp_set_dynamic (.false.)
+  call omp_set_num_threads (4)
+
+!$omp parallel num_threads (4) reduction (.or.:l) private (i)
+  i = omp_get_thread_num ()
+  if (i.eq.0) then
+    foo => fn0
+    bar1 => fn0
+    bar2 => fn0
+  elseif (i.eq.1) then
+    foo => fn1
+    bar1 => fn1
+    bar2 => fn1
+  elseif (i.eq.2) then
+    foo => fn2
+    bar1 => fn2
+    bar2 => fn2
+  else
+    foo => fn3
+    bar1 => fn3
+    bar2 => fn3
+  end if
+  vi = -1
+!$omp barrier
+  vi = -1
+  call foo ()
+  l=l.or.(vi.ne.i)
+  vi = -2
+  call bar1 ()
+  l=l.or.(vi.ne.i)
+  vi = -3
+  call bar2 ()
+  l=l.or.(vi.ne.i)
+  vi = -1
+!$omp end parallel
+
+  if (l) call abort
+
+end
+
+! { dg-final { cleanup-modules "threadprivate4" } }