Commit 1515bfe4 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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
------------------------------------------------------------------------

llvm-svn: 322639
parent 684dcd3d

openmp/runtime/src/kmp_ftn_entry.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_MAX_THREADS)(void) { 
}



#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;