Post-merge fixes

Author: Meinersbur

flang-rt/unittests/Runtime/CUDA/Allocatable.cpp

@@ -12,10 +12,9 @@
 #include "flang-rt/CUDA/allocator.h"
 #include "flang-rt/allocator-registry.h"
 #include "flang-rt/descriptor.h"
+#include "flang-rt/memory.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
-#include "flang/Runtime/descriptor.h"
-#include "flang/Runtime/memory.h"
 #include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"

flang-rt/unittests/Runtime/CUDA/AllocatorCUF.cpp

@@ -12,10 +12,9 @@
 #include "flang-rt/CUDA/allocator.h"
 #include "flang-rt/allocator-registry.h"
 #include "flang-rt/descriptor.h"
+#include "flang-rt/memory.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
-#include "flang/Runtime/descriptor.h"
-#include "flang/Runtime/memory.h"
 #include "flang/Support/Fortran.h"
 
 using namespace Fortran::runtime;

flang/unittests/Evaluate/CMakeLists.txt

@@ -33,7 +33,6 @@ add_flang_nongtest_unittest(intrinsics
   FortranDecimal
   FortranSemantics
   FortranParser
-  flang_rt
 )
 
 add_flang_nongtest_unittest(logical