Post-merge fixes

Author: Meinersbur

flang-rt/lib/CMakeLists.txt

@@ -10,7 +10,7 @@ add_subdirectory(FortranFloat128Math)
 add_subdirectory(flang_rt)
 
 if (FLANG_RT_ENABLE_CUF)
-  add_subdirectory(CufRuntime)
+  add_subdirectory(flang_rt/CUDA)
 endif()
 
 if (FLANG_RT_INCLUDE_TESTS)

flang-rt/lib/flang_rt/CUDA/allocatable.cpp

@@ -8,9 +8,9 @@
 
 #include "flang/Runtime/CUDA/allocatable.h"
 #include "flang-rt/descriptor.h"
-#include "../flang_rt/assign-impl.h"
-#include "../flang_rt/stat.h"
-#include "../flang_rt/terminator.h"
+#include "../assign-impl.h"
+#include "../stat.h"
+#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/CUDA/memmove-function.h"

flang-rt/lib/flang_rt/CUDA/allocator.cpp

@@ -8,10 +8,10 @@
 
 #include "flang-rt/CUDA/allocator.h"
 #include "flang-rt/allocator-registry.h"
-#include "../flang_rt/derived.h"
-#include "../flang_rt/stat.h"
-#include "../flang_rt/terminator.h"
-#include "../flang_rt/type-info.h"
+#include "../derived.h"
+#include "../stat.h"
+#include "../terminator.h"
+#include "../type-info.h"
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Support/Fortran.h"

flang-rt/lib/flang_rt/CUDA/descriptor.cpp

@@ -9,7 +9,7 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang-rt/CUDA/allocator.h"
 #include "flang-rt/descriptor.h"
-#include "../flang_rt/terminator.h"
+#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 
 #include "cuda_runtime.h"

flang-rt/lib/flang_rt/CUDA/kernel.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/kernel.h"
-#include "../flang_rt/terminator.h"
+#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 
 #include "cuda_runtime.h"

flang-rt/lib/flang_rt/CUDA/memory.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/memory.h"
-#include "../flang_rt/assign-impl.h"
-#include "../flang_rt/terminator.h"
+#include "../assign-impl.h"
+#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/CUDA/memmove-function.h"

flang-rt/lib/flang_rt/CUDA/registration.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/registration.h"
-#include "../flang_rt/terminator.h"
+#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 
 #include "cuda_runtime.h"