Fix types of Fortran array elements

Fortran array elements made default integer in OMP_GET_PLACE_PROC_IDS and
OMP_GET_PARTITION_PLACE_NUMS subroutines, otherwise call to them produces
incorrect result.

Patch by Olga Malysheva

Differential Revision: https://reviews.llvm.org/D40356

llvm-svn: 319372

6 files changed, 12 insertions, 12 deletions

diff --git a/openmp/runtime/src/include/45/omp_lib.f.var b/openmp/runtime/src/include/45/omp_lib.f.var
index 67ff031d3a4..74e6bc3ecb5 100644
--- a/openmp/runtime/src/include/45/omp_lib.f.var
+++ b/openmp/runtime/src/include/45/omp_lib.f.var
@@ -199,7 +199,7 @@
           subroutine omp_get_place_proc_ids(place_num, ids)
             use omp_lib_kinds
             integer (kind=omp_integer_kind) place_num
-            integer (kind=kmp_pointer_kind) ids(*)
+            integer (kind=omp_integer_kind) ids(*)
           end subroutine omp_get_place_proc_ids
 
           function omp_get_place_num()
@@ -214,7 +214,7 @@
 
           subroutine omp_get_partition_place_nums(place_nums)
             use omp_lib_kinds
-            integer (kind=kmp_pointer_kind) place_nums(*)
+            integer (kind=omp_integer_kind) place_nums(*)
           end subroutine omp_get_partition_place_nums
 
           function omp_get_wtime()
diff --git a/openmp/runtime/src/include/45/omp_lib.f90.var b/openmp/runtime/src/include/45/omp_lib.f90.var
index 0e97d579b64..b5fc44ece9f 100644
--- a/openmp/runtime/src/include/45/omp_lib.f90.var
+++ b/openmp/runtime/src/include/45/omp_lib.f90.var
@@ -197,7 +197,7 @@
           subroutine omp_get_place_proc_ids(place_num, ids) bind(c)
             use omp_lib_kinds
             integer (kind=omp_integer_kind), value :: place_num
-            integer (kind=kmp_pointer_kind) ids(*)
+            integer (kind=omp_integer_kind) ids(*)
           end subroutine omp_get_place_proc_ids
 
           function omp_get_place_num() bind(c)
@@ -212,7 +212,7 @@
 
           subroutine omp_get_partition_place_nums(place_nums) bind(c)
             use omp_lib_kinds
-            integer (kind=kmp_pointer_kind) place_nums(*)
+            integer (kind=omp_integer_kind) place_nums(*)
           end subroutine omp_get_partition_place_nums
 
           function omp_get_wtime() bind(c)
diff --git a/openmp/runtime/src/include/45/omp_lib.h.var b/openmp/runtime/src/include/45/omp_lib.h.var
index 76284f27ed1..58763b35e06 100644
--- a/openmp/runtime/src/include/45/omp_lib.h.var
+++ b/openmp/runtime/src/include/45/omp_lib.h.var
@@ -186,7 +186,7 @@
         subroutine omp_get_place_proc_ids(place_num, ids) bind(c)
           import
           integer (kind=omp_integer_kind), value :: place_num
-          integer (kind=kmp_pointer_kind) ids(*)
+          integer (kind=omp_integer_kind) ids(*)
         end subroutine omp_get_place_proc_ids
 
         function omp_get_place_num() bind(c)
@@ -201,7 +201,7 @@
 
         subroutine omp_get_partition_place_nums(place_nums) bind(c)
           import
-          integer (kind=kmp_pointer_kind) place_nums(*)
+          integer (kind=omp_integer_kind) place_nums(*)
         end subroutine omp_get_partition_place_nums
 
         function omp_get_wtime() bind(c)
diff --git a/openmp/runtime/src/include/50/omp_lib.f.var b/openmp/runtime/src/include/50/omp_lib.f.var
index 2b85a84a017..d5ced357d05 100644
--- a/openmp/runtime/src/include/50/omp_lib.f.var
+++ b/openmp/runtime/src/include/50/omp_lib.f.var
@@ -201,7 +201,7 @@
           subroutine omp_get_place_proc_ids(place_num, ids)
             use omp_lib_kinds
             integer (kind=omp_integer_kind) place_num
-            integer (kind=kmp_pointer_kind) ids(*)
+            integer (kind=omp_integer_kind) ids(*)
           end subroutine omp_get_place_proc_ids
 
           function omp_get_place_num()
@@ -216,7 +216,7 @@
 
           subroutine omp_get_partition_place_nums(place_nums)
             use omp_lib_kinds
-            integer (kind=kmp_pointer_kind) place_nums(*)
+            integer (kind=omp_integer_kind) place_nums(*)
           end subroutine omp_get_partition_place_nums
 
           function omp_get_wtime()
diff --git a/openmp/runtime/src/include/50/omp_lib.f90.var b/openmp/runtime/src/include/50/omp_lib.f90.var
index 17c56c9d056..60aa8dd19ff 100644
--- a/openmp/runtime/src/include/50/omp_lib.f90.var
+++ b/openmp/runtime/src/include/50/omp_lib.f90.var
@@ -209,7 +209,7 @@
           subroutine omp_get_place_proc_ids(place_num, ids) bind(c)
             use omp_lib_kinds
             integer (kind=omp_integer_kind), value :: place_num
-            integer (kind=kmp_pointer_kind) ids(*)
+            integer (kind=omp_integer_kind) ids(*)
           end subroutine omp_get_place_proc_ids
 
           function omp_get_place_num() bind(c)
@@ -224,7 +224,7 @@
 
           subroutine omp_get_partition_place_nums(place_nums) bind(c)
             use omp_lib_kinds
-            integer (kind=kmp_pointer_kind) place_nums(*)
+            integer (kind=omp_integer_kind) place_nums(*)
           end subroutine omp_get_partition_place_nums
 
           function omp_get_wtime() bind(c)
diff --git a/openmp/runtime/src/include/50/omp_lib.h.var b/openmp/runtime/src/include/50/omp_lib.h.var
index 377c46fbdba..5ac334b1b88 100644
--- a/openmp/runtime/src/include/50/omp_lib.h.var
+++ b/openmp/runtime/src/include/50/omp_lib.h.var
@@ -198,7 +198,7 @@
         subroutine omp_get_place_proc_ids(place_num, ids) bind(c)
           import
           integer (kind=omp_integer_kind), value :: place_num
-          integer (kind=kmp_pointer_kind) ids(*)
+          integer (kind=omp_integer_kind) ids(*)
         end subroutine omp_get_place_proc_ids
 
         function omp_get_place_num() bind(c)
@@ -213,7 +213,7 @@
 
         subroutine omp_get_partition_place_nums(place_nums) bind(c)
           import
-          integer (kind=kmp_pointer_kind) place_nums(*)
+          integer (kind=omp_integer_kind) place_nums(*)
         end subroutine omp_get_partition_place_nums
 
         function omp_get_wtime() bind(c)