daltenty
diff --git a/‎offload/CMakeLists.txt
+1-1 b/‎offload/CMakeLists.txt
+1-1
diff --git a/‎offload/src/CMakeLists.txt ‎offload/libomptarget/CMakeLists.txt b/‎offload/src/CMakeLists.txt ‎offload/libomptarget/CMakeLists.txt
diff --git a/‎offload/src/DeviceImage.cpp ‎offload/libomptarget/DeviceImage.cpp b/‎offload/src/DeviceImage.cpp ‎offload/libomptarget/DeviceImage.cpp
diff --git a/‎offload/src/KernelLanguage/API.cpp ‎offload/libomptarget/KernelLanguage/API.cpp b/‎offload/src/KernelLanguage/API.cpp ‎offload/libomptarget/KernelLanguage/API.cpp
diff --git a/‎offload/src/LegacyAPI.cpp ‎offload/libomptarget/LegacyAPI.cpp b/‎offload/src/LegacyAPI.cpp ‎offload/libomptarget/LegacyAPI.cpp
diff --git a/‎offload/src/OffloadRTL.cpp ‎offload/libomptarget/OffloadRTL.cpp b/‎offload/src/OffloadRTL.cpp ‎offload/libomptarget/OffloadRTL.cpp
diff --git a/‎offload/src/OpenMP/API.cpp ‎offload/libomptarget/OpenMP/API.cpp
+2-2 b/‎offload/src/OpenMP/API.cpp ‎offload/libomptarget/OpenMP/API.cpp
+2-2
diff --git a/‎offload/src/OpenMP/InteropAPI.cpp ‎offload/libomptarget/OpenMP/InteropAPI.cpp b/‎offload/src/OpenMP/InteropAPI.cpp ‎offload/libomptarget/OpenMP/InteropAPI.cpp
diff --git a/‎offload/src/OpenMP/Mapping.cpp ‎offload/libomptarget/OpenMP/Mapping.cpp b/‎offload/src/OpenMP/Mapping.cpp ‎offload/libomptarget/OpenMP/Mapping.cpp
diff --git a/‎offload/src/OpenMP/OMPT/Callback.cpp ‎offload/libomptarget/OpenMP/OMPT/Callback.cpp b/‎offload/src/OpenMP/OMPT/Callback.cpp ‎offload/libomptarget/OpenMP/OMPT/Callback.cpp
diff --git a/‎offload/src/PluginManager.cpp ‎offload/libomptarget/PluginManager.cpp b/‎offload/src/PluginManager.cpp ‎offload/libomptarget/PluginManager.cpp
diff --git a/‎offload/src/device.cpp ‎offload/libomptarget/device.cpp b/‎offload/src/device.cpp ‎offload/libomptarget/device.cpp
diff --git a/‎offload/src/exports ‎offload/libomptarget/exports b/‎offload/src/exports ‎offload/libomptarget/exports
diff --git a/‎offload/src/interface.cpp ‎offload/libomptarget/interface.cpp
+1-1 b/‎offload/src/interface.cpp ‎offload/libomptarget/interface.cpp
+1-1
diff --git a/‎offload/src/omptarget.cpp ‎offload/libomptarget/omptarget.cpp b/‎offload/src/omptarget.cpp ‎offload/libomptarget/omptarget.cpp
diff --git a/‎offload/src/private.h ‎offload/libomptarget/private.h b/‎offload/src/private.h ‎offload/libomptarget/private.h
@@ -377,7 +377,7 @@ add_subdirectory(DeviceRTL)
 add_subdirectory(tools)
 
 # Build target agnostic offloading library.
-add_subdirectory(src)
+add_subdirectory(libomptarget)
 
 add_subdirectory(tools/offload-tblgen)
 add_subdirectory(liboffload)
 
@@ -655,8 +655,8 @@ EXTERN void *omp_get_mapped_ptr(const void *Ptr, int DeviceNum) {
 
   int NumDevices = omp_get_initial_device();
   if (DeviceNum == NumDevices) {
-    DP("Device %d is initial device, returning Ptr " DPxMOD ".\n",
-           DeviceNum, DPxPTR(Ptr));
+    DP("Device %d is initial device, returning Ptr " DPxMOD ".\n", DeviceNum,
+       DPxPTR(Ptr));
     return const_cast<void *>(Ptr);
   }
 
 
@@ -294,7 +294,7 @@ static KernelArgsTy *upgradeKernelArgs(KernelArgsTy *KernelArgs,
 
   // FIXME: This is a WA to "calibrate" the bad work done in the front end.
   // Delete this ugly code after the front end emits proper values.
-  auto CorrectMultiDim = [](uint32_t(&Val)[3]) {
+  auto CorrectMultiDim = [](uint32_t (&Val)[3]) {
     if (Val[1] == 0)
       Val[1] = 1;
     if (Val[2] == 0)
Original file line number	Diff line number	Diff line change
`@@ -655,8 +655,8 @@ EXTERN void omp_get_mapped_ptr(const void Ptr, int DeviceNum) {`
`655`	`655`
`656`	`656`	`int NumDevices = omp_get_initial_device();`
`657`	`657`	`if (DeviceNum == NumDevices) {`
`658`		`- DP("Device %d is initial device, returning Ptr " DPxMOD ".\n",`
`659`		`- DeviceNum, DPxPTR(Ptr));`
	`658`	`+ DP("Device %d is initial device, returning Ptr " DPxMOD ".\n", DeviceNum,`
	`659`	`+ DPxPTR(Ptr));`
`660`	`660`	`return const_cast<void *>(Ptr);`
`661`	`661`	`}`
`662`	`662`