diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp --- a/openmp/libomptarget/src/omptarget.cpp +++ b/openmp/libomptarget/src/omptarget.cpp @@ -764,8 +764,8 @@ } } else { char *Ptr = (char *)ArgsBase + Offset; - DP("Transfer of non-contiguous : host ptr %lx offset %ld len %ld\n", - (uint64_t)Ptr, Offset, Size); + DP("Transfer of non-contiguous : host ptr " DPxMOD " offset %" PRIu64 + " len %" PRIu64 "\n", DPxPTR(Ptr), Offset, Size); Ret = targetDataContiguous(loc, Device, ArgsBase, Ptr, Size, ArgType); } return Ret; @@ -894,7 +894,7 @@ if (I != Device.LoopTripCnt.end()) { LoopTripCount = I->second; Device.LoopTripCnt.erase(I); - DP("loop trip count is %lu.\n", LoopTripCount); + DP("loop trip count is %" PRIu64 ".\n", LoopTripCount); } } diff --git a/openmp/libomptarget/src/private.h b/openmp/libomptarget/src/private.h --- a/openmp/libomptarget/src/private.h +++ b/openmp/libomptarget/src/private.h @@ -112,9 +112,9 @@ for (const auto &HostTargetMap : Device.HostDataToTargetMap) { SourceInfo Info(HostTargetMap.HstPtrName); INFO(OMP_INFOTYPE_ALL, Device.DeviceID, - DPxMOD " " DPxMOD " %-8lu %-8ld %s at %s:%d:%d\n", + DPxMOD " " DPxMOD " %-8" PRIuPTR " %-8" PRId64 " %s at %s:%d:%d\n", DPxPTR(HostTargetMap.HstPtrBegin), DPxPTR(HostTargetMap.TgtPtrBegin), - (long unsigned)(HostTargetMap.HstPtrEnd - HostTargetMap.HstPtrBegin), + HostTargetMap.HstPtrEnd - HostTargetMap.HstPtrBegin, HostTargetMap.getRefCount(), Info.getName(), Info.getFilename(), Info.getLine(), Info.getColumn()); } @@ -152,7 +152,7 @@ else type = "use_address"; - INFO(OMP_INFOTYPE_ALL, DeviceId, "%s(%s)[%ld] %s\n", type, + INFO(OMP_INFOTYPE_ALL, DeviceId, "%s(%s)[%" PRId64 "] %s\n", type, getNameFromMapping(varName).c_str(), ArgSizes[i], implicit); } }