Merge branch 'users/meinersbur/flang_runtime_FortranSupport' into users/meinersbur/flang_runtime_move-files

Author: Meinersbur

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

@@ -15,6 +15,7 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/CUDA/memmove-function.h"
 #include "flang/Runtime/allocatable.h"
+#include "flang/Runtime/descriptor.h"
 
 #include "cuda_runtime.h"
 

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

@@ -15,6 +15,7 @@
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Support/Fortran.h"
+#include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"
 

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

@@ -15,6 +15,9 @@
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Support/Fortran.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

@@ -15,6 +15,9 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
 #include "flang/Support/Fortran.h"
+#include "flang/Runtime/descriptor.h"
+#include "flang/Runtime/memory.h"
+#include "flang/Support/Fortran.h"
 
 using namespace Fortran::runtime;
 using namespace Fortran::runtime::cuda;

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

@@ -16,6 +16,7 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
 #include "flang/Support/Fortran.h"
+#include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"
 

flang/lib/Optimizer/Builder/IntrinsicCall.cpp

@@ -778,7 +778,7 @@ prettyPrintIntrinsicName(fir::FirOpBuilder &builder, mlir::Location loc,
 // Generate a call to the Fortran runtime library providing
 // support for 128-bit float math.
 // On 'HAS_LDBL128' targets the implementation
-// is provided by flang_rt, otherwise, it is done via
+// is provided by FortranRuntime, otherwise, it is done via
 // FortranFloat128Math library. In the latter case the compiler
 // has to be built with FLANG_RUNTIME_F128_MATH_LIB to guarantee
 // proper linking actions in the driver.

flang/tools/f18-parse-demo/CMakeLists.txt

@@ -12,5 +12,6 @@ add_flang_tool(f18-parse-demo
 target_link_libraries(f18-parse-demo
   PRIVATE
   FortranCommon
+  FortranSupport
   FortranParser
   )

flang/tools/f18-parse-demo/f18-parse-demo.cpp

@@ -21,7 +21,6 @@
 // scaffolding compiler driver that can test some semantic passes of the
 // F18 compiler under development.
 
-#include "flang/Support/Fortran-features.h"
 #include "flang/Parser/characters.h"
 #include "flang/Parser/dump-parse-tree.h"
 #include "flang/Parser/message.h"
@@ -30,6 +29,7 @@
 #include "flang/Parser/parsing.h"
 #include "flang/Parser/provenance.h"
 #include "flang/Parser/unparse.h"
+#include "flang/Support/Fortran-features.h"
 #include "flang/Support/default-kinds.h"
 #include "llvm/Support/Errno.h"
 #include "llvm/Support/FileSystem.h"

flang/tools/tco/CMakeLists.txt

@@ -20,6 +20,7 @@ target_link_libraries(tco PRIVATE
   flangPasses
   FlangOpenMPTransforms
   FortranCommon
+  FortranSupport
   ${dialect_libs}
   ${extension_libs}
   MLIRIR

flang/unittests/Evaluate/CMakeLists.txt

@@ -27,6 +27,7 @@ add_flang_nongtest_unittest(uint128
 
 add_flang_nongtest_unittest(expression
   FortranCommon
+  FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
   FortranSemantics
@@ -41,6 +42,7 @@ add_flang_nongtest_unittest(integer
 
 add_flang_nongtest_unittest(intrinsics
   FortranCommon
+  FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
   FortranSemantics
@@ -63,12 +65,15 @@ set(LLVM_REQUIRES_RTTI ON)
 add_flang_nongtest_unittest(real
   FortranEvaluateTesting
   FortranEvaluate
+  FortranCommon
+  FortranSupport
   FortranSemantics
 )
 llvm_update_compile_flags(real.test)
 
 add_flang_nongtest_unittest(folding
   FortranCommon
+  FortranSupport
   FortranEvaluateTesting
   FortranEvaluate
   FortranSemantics

flang/unittests/Frontend/CMakeLists.txt

@@ -19,6 +19,7 @@ target_link_libraries(FlangFrontendTests
   FortranParser
   FortranSemantics
   FortranCommon
+  FortranSupport
   FortranEvaluate
   MLIRIR
 )