[llvm-branch-commits] [openmp] r322639 - Merging r322068:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 17 04:51:30 2018
New Revision: 322639

URL: http://llvm.org/viewvc/llvm-project?rev=322639&view=rev
Log:
Merging r322068:
------------------------------------------------------------------------
r322068 | pawosm01 | 2018-01-09 02:54:06 -0800 (Tue, 09 Jan 2018) | 3 lines

Fix type mismatch in omp_control_tool() implementation that makes it run incorrectly on 32-bit machines.

Differential Revision: https://reviews.llvm.org/D41854
------------------------------------------------------------------------

Modified:
    openmp/branches/release_60/   (props changed)
    openmp/branches/release_60/runtime/src/kmp_ftn_entry.h

Propchange: openmp/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 17 04:51:30 2018
@@ -1 +1 @@
-/openmp/trunk:321964
+/openmp/trunk:321964,322068

Modified: openmp/branches/release_60/runtime/src/kmp_ftn_entry.h
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/runtime/src/kmp_ftn_entry.h?rev=322639&r1=322638&r2=322639&view=diff
==============================================================================
--- openmp/branches/release_60/runtime/src/kmp_ftn_entry.h (original)
+++ openmp/branches/release_60/runtime/src/kmp_ftn_entry.h Wed Jan 17 04:51:30 2018
@@ -345,7 +345,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
 }
 
 #if OMP_50_ENABLED
-int FTN_STDCALL FTN_CONTROL_TOOL(uint64_t command, uint64_t modifier,
+int FTN_STDCALL FTN_CONTROL_TOOL(int command, int modifier,
                                  void *arg) {
 #if defined(KMP_STUB) || !OMPT_SUPPORT
   return -2;