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

Author: Meinersbur

flang-rt/.clang-format

@@ -16,7 +16,7 @@ IncludeCategories:
     Priority:        4
   - Regex:           '^"flang-rt/'  # Public Flang-RT headers
     Priority:        3
-  - Regex:           '^[^/]*$'      # Private header from same library
+  - Regex:           '^[^/]*$'      # Private headers from same library
     Priority:        1
   - Regex:           '.*'           # Private headers from sibling libraries
     Priority:        2

flang/include/flang/Runtime/allocatable.h

@@ -11,12 +11,10 @@
 #ifndef FORTRAN_RUNTIME_ALLOCATABLE_H_
 #define FORTRAN_RUNTIME_ALLOCATABLE_H_
 
-#include "flang/Common/Fortran-consts.h"
 #include "flang/Runtime/descriptor-consts.h"
 #include "flang/Runtime/entry-names.h"
 
 namespace Fortran::runtime {
-using SubscriptValue = ISO::CFI_index_t;
 using common::TypeCategory;
 
 extern "C" {

flang/include/flang/Runtime/io-api.h

@@ -1,4 +1,4 @@
-//===-- include/flang-rt/io-api.h -------------------------------*- C++ -*-===//
+//===-- include/flang/Runtime/io-api.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/Runtime/pointer.h

@@ -12,14 +12,10 @@
 #ifndef FORTRAN_RUNTIME_POINTER_H_
 #define FORTRAN_RUNTIME_POINTER_H_
 
-#include "flang/Common/Fortran-consts.h"
 #include "flang/Runtime/descriptor-consts.h"
 #include "flang/Runtime/entry-names.h"
 
 namespace Fortran::runtime {
-using SubscriptValue = ISO::CFI_index_t;
-using common::TypeCategory;
-
 extern "C" {
 
 // Data pointer initialization for NULLIFY(), "p=>NULL()`, & for ALLOCATE().
@@ -126,4 +122,4 @@ RT_API_ATTRS bool ValidatePointerPayload(const ISO::CFI_cdesc_t &);
 
 } // extern "C"
 } // namespace Fortran::runtime
-#endif /* FORTRAN_RUNTIME_POINTER_H_ */
+#endif // FORTRAN_RUNTIME_POINTER_H_

flang/include/flang/Semantics/semantics.h

@@ -17,7 +17,6 @@
 #include "flang/Evaluate/intrinsics.h"
 #include "flang/Evaluate/target.h"
 #include "flang/Parser/message.h"
-#include "flang/Semantics/module-dependences.h"
 #include "flang/Support/Fortran-features.h"
 #include "flang/Support/LangOptions.h"
 #include <iosfwd>

flang/lib/Optimizer/Dialect/FIRType.cpp

@@ -1419,4 +1419,4 @@ fir::getTypeSizeAndAlignmentOrCrash(mlir::Location loc, mlir::Type ty,
   if (result)
     return *result;
   TODO(loc, "computing size of a component");
-}
+}

flang/lib/Support/CMakeLists.txt

@@ -42,7 +42,6 @@ if(FLANG_VENDOR)
     PROPERTIES COMPILE_DEFINITIONS "FLANG_VENDOR=\"${FLANG_VENDOR} \"")
 endif()
 
-
 add_flang_library(FortranSupport
   Fortran.cpp
   Fortran-features.cpp
@@ -54,8 +53,8 @@ add_flang_library(FortranSupport
   ${version_inc}
 
   LINK_COMPONENTS
-    Support
+  Support
 
   LINK_LIBS
-    MLIRIR
+  MLIRIR
 )

flang/test/lit.cfg.py

@@ -163,6 +163,7 @@
         ToolSubst("%not_todo_abort_cmd", command=FindTool("not"), unresolved="fatal")
     )
 
+    config.available_features.add("flang-rt")
 # Add all the tools and their substitutions (if applicable). Use the search paths provided for
 # finding the tools.
 if config.flang_standalone_build:

flang/tools/f18/CMakeLists.txt

@@ -105,7 +105,7 @@ if (NOT CMAKE_CROSSCOMPILING)
     set(compile_with "-fsyntax-only")
     set(object_output "")
     set(include_in_link FALSE)
-    if(${filename} IN_LIST MODULES_WITH_IMPLEMENTATION AND FORTRAN_INCLUDE_RUNTIME)
+    if(${filename} IN_LIST MODULES_WITH_IMPLEMENTATION AND FLANG_INCLUDE_RUNTIME)
       set(object_output "${CMAKE_CURRENT_BINARY_DIR}/${filename}${CMAKE_CXX_OUTPUT_EXTENSION}")
       set(compile_with -c -o ${object_output})
       set(include_in_link TRUE)

flang/unittests/CMakeLists.txt

@@ -26,7 +26,7 @@ function(add_flang_unittest_offload_properties target)
   # FIXME: replace 'native' in --offload-arch option with the list
   #        of targets that Fortran Runtime was built for.
   #        Common code must be moved from flang/runtime/CMakeLists.txt.
-  if (FLANG_EXPERIMENTAL_OMP_OFFLOAD_BUILD)
+  if (NOT FLANG_EXPERIMENTAL_OMP_OFFLOAD_BUILD STREQUAL "off")
     set_target_properties(${target}
       PROPERTIES LINK_OPTIONS
       "-fopenmp;--offload-arch=native"