Post-merge fixes

Author: Meinersbur

flang-rt/include/flang-rt/descriptor.h

@@ -18,10 +18,10 @@
 // User C code is welcome to depend on that ISO_Fortran_binding.h file,
 // but should never reference this internal header.
 
+#include "flang-rt/memory.h"
+#include "flang-rt/type-code.h"
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/descriptor-consts.h"
-#include "flang/Runtime/memory.h"
-#include "flang/Runtime/type-code.h"
 #include <algorithm>
 #include <cassert>
 #include <cinttypes>

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"

flang-rt/unittests/Runtime/CUDA/CMakeLists.txt

@@ -9,11 +9,20 @@
 if (FLANG_CUF_RUNTIME)
 
 add_flang_unittest(FlangCufRuntimeTests
+  Allocatable.cpp
   AllocatorCUF.cpp
+  Memory.cpp
 )
 
+if (BUILD_SHARED_LIBS)
+  set(CUDA_RT_TARGET CUDA::cudart)
+else()
+  set(CUDA_RT_TARGET CUDA::cudart_static)
+endif()
+
 target_link_libraries(FlangCufRuntimeTests
   PRIVATE
+  ${CUDA_RT_TARGET}
   CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}
   FortranRuntime
 )

flang/unittests/Runtime/CUDA/Memory.cpp renamed to flang-rt/unittests/Runtime/CUDA/Memory.cpp

@@ -7,15 +7,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/memory.h"
+#include "flang-rt/CUDA/allocator.h"
+#include "flang-rt/allocator-registry.h"
 #include "gtest/gtest.h"
-#include "../../../runtime/terminator.h"
+#include "../../../lib/flang_rt/terminator.h"
 #include "../tools.h"
-#include "flang/Common/Fortran.h"
-#include "flang/Runtime/CUDA/allocator.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
-#include "flang/Runtime/allocator-registry.h"
+#include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"