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

Author: Meinersbur

flang-rt/.clang-format

@@ -9,13 +9,17 @@ AlignOperands: false
 AlignTrailingComments: false
 IncludeCategories:
   - Regex:           '^<'
-    Priority:        4
+    Priority:        6
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        5
+  - Regex:           '^"flang/'     # Headers shared with Flang
+    Priority:        4
+  - Regex:           '^"flang-rt/'  # Public Flang-RT headers
     Priority:        3
-  - Regex:           '^"(flang|\.\.)/'
-    Priority:        2
-  - Regex:           '.*'
+  - Regex:           '^[^/]*$'      # Private header from same library
     Priority:        1
+  - Regex:           '.*'           # Private headers from sibling libraries
+    Priority:        2
 ...
 
 # vim:set filetype=yaml:

flang-rt/CMakeLists.txt

@@ -68,7 +68,6 @@ include(GetToolchainDirs)
 include(FlangCommon)
 include(HandleCompilerRT)
 include(ExtendPath)
-include(GNUInstallDirs)
 
 
 ############################
@@ -110,9 +109,9 @@ else ()
   # be installed there using the same prefix. This is to not have a difference
   # 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}")
+  set(FLANG_RT_INSTALL_RESOURCE_PATH "lib/clang/${LLVM_VERSION_MAJOR}")
 
-  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "${CMAKE_INSTALL_LIBDIR}")
+  extend_path(FLANG_RT_OUTPUT_RESOURCE_LIB_DIR "${FLANG_RT_OUTPUT_RESOURCE_DIR}" "lib")
 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)

flang-rt/cmake/modules/GetToolchainDirs.cmake

@@ -6,8 +6,6 @@
 #
 #===------------------------------------------------------------------------===#
 
-include(GNUInstallDirs)
-
 
 # Determine the subdirectory relative to Clang's resource dir/sysroot where to
 # install target-specific libraries, to be found by Clang/Flang driver. This was
@@ -35,15 +33,15 @@ include(GNUInstallDirs)
 # ToolChain::getArchSpecificLibPaths(...).
 function (get_toolchain_library_subdir outvar)
   if (NOT APPLE)
-    set(outval "${CMAKE_INSTALL_LIBDIR}")
+    set(outval "lib")
   else ()
     # Required to be "darwin" for MachO toolchain.
     get_toolchain_os_dirname(os_dirname)
-    set(outval "${CMAKE_INSTALL_LIBDIR}/${os_dirname}")
+    set(outval "lib/${os_dirname}")
   endif ()
 
   get_toolchain_arch_dirname(arch_dirname)
-  set(outval "${CMAKE_INSTALL_LIBDIR}/${arch_dirname}")
+  set(outval "lib/${arch_dirname}")
 
   set(${outvar} "${outval}" PARENT_SCOPE)
 endfunction ()

flang-rt/lib/FortranFloat128Math/math-entries.h

@@ -8,8 +8,9 @@
 
 #ifndef FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
 #define FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
-#include "terminator.h"
-#include "tools.h"
+
+#include "../flang_rt/terminator.h"
+#include "../flang_rt/tools.h"
 #include "flang/Common/float128.h"
 #include "flang/Runtime/entry-names.h"
 #include <cfloat>

flang-rt/lib/FortranFloat128Math/norm2.cpp

@@ -8,7 +8,7 @@
 
 #include "math-entries.h"
 #include "numeric-template-specs.h"
-#include "reduction-templates.h"
+#include "../flang_rt/reduction-templates.h"
 
 namespace Fortran::runtime {
 extern "C" {

flang-rt/lib/FortranFloat128Math/numeric-template-specs.h

@@ -10,7 +10,7 @@
 #define FLANG_RT_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
 
 #include "math-entries.h"
-#include "numeric-templates.h"
+#include "../flang_rt/numeric-templates.h"
 
 namespace Fortran::runtime {
 using F128Type = CppTypeFor<TypeCategory::Real, 16>;

flang-rt/lib/FortranFloat128Math/random.cpp

@@ -8,7 +8,7 @@
 
 #include "math-entries.h"
 #include "numeric-template-specs.h"
-#include "random-templates.h"
+#include "../flang_rt/random-templates.h"
 
 using namespace Fortran::runtime::random;
 extern "C" {

flang-rt/lib/flang_rt/CMakeLists.txt

@@ -15,8 +15,8 @@ set(BACKTRACE_HEADER ${Backtrace_HEADER})
 
 # List of files that are buildable for all devices.
 set(supported_sources
-  ${FLANG_SOURCE_DIR}/lib/Common/binary-to-decimal.cpp
-  ${FLANG_SOURCE_DIR}/lib/Common/decimal-to-binary.cpp
+  ${FLANG_SOURCE_DIR}/lib/Decimal/binary-to-decimal.cpp
+  ${FLANG_SOURCE_DIR}/lib/Decimal/decimal-to-binary.cpp
   ISO_Fortran_binding.cpp
   allocator-registry.cpp
   allocatable.cpp
@@ -72,15 +72,13 @@ set(supported_sources
 
 # List of source not used for GPU offloading.
 set(host_sources
-  ${FLANG_SOURCE_DIR}/lib/Common/binary-to-decimal.cpp
-  ${FLANG_SOURCE_DIR}/lib/Common/decimal-to-binary.cpp
+  ${FLANG_SOURCE_DIR}/module/iso_fortran_env_impl.f90
   command.cpp
   complex-powi.cpp
   complex-reduction.c
   exceptions.cpp
   execute.cpp
   extensions.cpp
-  ${FLANG_SOURCE_DIR}/module/iso_fortran_env_impl.f90
   main.cpp
   random.cpp
   reduce.cpp

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

@@ -7,15 +7,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/allocatable.h"
-#include "flang-rt/descriptor.h"
 #include "../assign-impl.h"
 #include "../stat.h"
 #include "../terminator.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Runtime/CUDA/common.h"
 #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

@@ -7,15 +7,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang-rt/CUDA/allocator.h"
-#include "flang-rt/allocator-registry.h"
 #include "../derived.h"
 #include "../stat.h"
 #include "../terminator.h"
 #include "../type-info.h"
+#include "flang-rt/allocator-registry.h"
 #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"