[llvm-branch-commits] [openmp] r322640 - Merging r322160:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 17 04:52:58 2018
New Revision: 322640

URL: http://llvm.org/viewvc/llvm-project?rev=322640&view=rev
Log:
Merging r322160:
------------------------------------------------------------------------
r322160 | hahnfeld | 2018-01-10 00:10:23 -0800 (Wed, 10 Jan 2018) | 5 lines

[OMPT] Fix cast and printf of wait_id in lock test

This didn't work on 32 bit platforms.

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

Modified:
    openmp/branches/release_60/   (props changed)
    openmp/branches/release_60/runtime/test/ompt/synchronization/lock.c

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

Modified: openmp/branches/release_60/runtime/test/ompt/synchronization/lock.c
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/runtime/test/ompt/synchronization/lock.c?rev=322640&r1=322639&r2=322640&view=diff
==============================================================================
--- openmp/branches/release_60/runtime/test/ompt/synchronization/lock.c (original)
+++ openmp/branches/release_60/runtime/test/ompt/synchronization/lock.c Wed Jan 17 04:52:58 2018
@@ -10,7 +10,7 @@ int main()
     print_ids(0);
 
   omp_lock_t lock;
-  printf("%" PRIu64 ": &lock: %lli\n", ompt_get_thread_data()->value, (long long) &lock);
+  printf("%" PRIu64 ": &lock: %" PRIu64 "\n", ompt_get_thread_data()->value, (uint64_t) &lock);
   omp_init_lock(&lock);
   print_current_address(1);
   omp_set_lock(&lock);