Merge branch 'users/meinersbur/flang_runtime' into users/meinersbur/flang_runtime_shared

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/CMakeLists.txt

@@ -242,7 +242,6 @@ else ()
     message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, compile a standalone Flang-RT")
   endif ()
 endif ()
-pythonize_bool(FLANG_INCLUDE_RUNTIME)
 
 set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
     "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')")

flang/test/lit.site.cfg.py.in

@@ -1,6 +1,7 @@
 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
+import lit.util
 
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_shlib_dir = lit_config.substitute(path(r"@SHLIBDIR@"))
@@ -29,7 +30,7 @@ else:
     config.openmp_module_dir = None
 config.flang_runtime_f128_math_lib = "@FLANG_RUNTIME_F128_MATH_LIB@"
 config.have_ldbl_mant_dig_113 = "@HAVE_LDBL_MANT_DIG_113@"
-config.flang_include_runtime = @FLANG_INCLUDE_RUNTIME@
+config.flang_include_runtime = lit.util.pythonize_bool("@FLANG_INCLUDE_RUNTIME@")
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)

flang/unittests/Evaluate/CMakeLists.txt

@@ -26,17 +26,14 @@ add_flang_nongtest_unittest(integer
   FortranSemantics
 )
 
-if (FLANG_INCLUDE_RUNTIME)
-  add_flang_nongtest_unittest(intrinsics
-    FortranSupport
-    NonGTestTesting
-    FortranEvaluate
-    FortranDecimal
-    FortranSemantics
-    FortranParser
-    flang_rt
-  )
-endif ()
+add_flang_nongtest_unittest(intrinsics
+  FortranSupport
+  NonGTestTesting
+  FortranEvaluate
+  FortranDecimal
+  FortranSemantics
+  FortranParser
+)
 
 add_flang_nongtest_unittest(logical
   NonGTestTesting