Fixed workaround made in https://reviews.llvm.org/D51694.

Patch suggested by Kelvin Li: removed optional "kind=" part of kind-selector
for variables with long names and kind names.

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

llvm-svn: 343475

diff --git a/openmp/runtime/src/include/50/omp_lib.h.var b/openmp/runtime/src/include/50/omp_lib.h.var
index b4158af..0e4c2c6 100644 (file)
--- a/openmp/runtime/src/include/50/omp_lib.h.var
+++ b/openmp/runtime/src/include/50/omp_lib.h.var
@@ -109,13 +109,13 @@
       integer(kind=omp_control_tool_kind)omp_control_tool_end
       parameter(omp_control_tool_end=4)
 
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_notool
+      integer(omp_control_tool_result_kind)omp_control_tool_notool
       parameter(omp_control_tool_notool=-2)
-      integer(kind=omp_integer_kind)omp_control_tool_nocallback
+      integer(omp_control_tool_result_kind)omp_control_tool_nocallback
       parameter(omp_control_tool_nocallback=-1)
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_success
+      integer(omp_control_tool_result_kind)omp_control_tool_success
       parameter(omp_control_tool_success=0)
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_ignored
+      integer(omp_control_tool_result_kind)omp_control_tool_ignored
       parameter(omp_control_tool_ignored=1)
 
       integer(kind=omp_allocator_kind)omp_null_allocator