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

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -88,6 +88,7 @@ set(LLVM_TOOLS_DIR "${LLVM_BINARY_DIR}/bin")
 # Determine build and install paths.
 # The build path is absolute, but the install dir is relative, CMake's install
 # command has to apply CMAKE_INSTALL_PREFIX itself.
+get_toolchain_library_subdir(toolchain_lib_subdir)
 if (LLVM_TREE_AVAILABLE)
   # In a bootstrap build emit the libraries into a default search path in the
   # build directory of the just-built compiler. This allows using the
@@ -98,6 +99,8 @@ if (LLVM_TREE_AVAILABLE)
   include(GetClangResourceDir)
   get_clang_resource_dir(FLANG_RT_OUTPUT_RESOURCE_DIR PREFIX "${LLVM_LIBRARY_OUTPUT_INTDIR}/..")
   get_clang_resource_dir(FLANG_RT_INSTALL_RESOURCE_PATH)
+
+  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "${toolchain_lib_subdir}")
 else ()
   # In a standalone runtimes build, do not write into LLVM_BINARY_DIR. It may be
   # read-only and/or shared by multiple runtimes with different build
@@ -108,11 +111,12 @@ else ()
   # between bootstrap and standalone runtimes builds.
   set(FLANG_RT_OUTPUT_RESOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
   set(FLANG_RT_INSTALL_RESOURCE_PATH "${CMAKE_INSTALL_LIBDIR}/clang/${LLVM_VERSION_MAJOR}")
+
+  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "${CMAKE_INSTALL_LIBDIR}")
 endif ()
+extend_path(FLANG_RT_INSTALL_RESOURCE_LIB_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_lib_subdir}")
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_DIR)
 cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_PATH)
-
-# Determine subdirectories for build output and install destinations.
 # FIXME: For the libflang_rt.so, the toolchain resource lib dir is not a good
 #        destination because it is not a ld.so default search path.
 #        The machine where the executable is eventually executed may not be the
@@ -122,9 +126,6 @@ cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_PATH)
 #        But the linker as invoked by the Flang driver also requires
 #        libflang_rt.so to be found when linking and the resource lib dir is
 #        the only reliable location.
-get_toolchain_library_subdir(toolchain_lib_subdir)
-extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "${toolchain_lib_subdir}")
-extend_path(FLANG_RT_INSTALL_RESOURCE_LIB_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_lib_subdir}")
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_LIB_DIR)
 cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_LIB_PATH)
 

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

@@ -64,6 +64,8 @@ set(LLVM_REQUIRES_RTTI ON)
 add_flang_nongtest_unittest(real
   FortranEvaluateTesting
   FortranEvaluate
+  FortranCommon
+  FortranSupport
   FortranSemantics
 )
 llvm_update_compile_flags(real.test)