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

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/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

@@ -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/allocatable.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"
 

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

@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/descriptor.h"
+#include "../terminator.h"
 #include "flang-rt/CUDA/allocator.h"
 #include "flang-rt/descriptor.h"
-#include "../terminator.h"
 #include "flang/Runtime/CUDA/common.h"
 
 #include "cuda_runtime.h"

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

@@ -10,9 +10,9 @@
 // as specified in section 18.5.5 of Fortran 2018.
 
 #include "ISO_Fortran_util.h"
+#include "terminator.h"
 #include "flang-rt/descriptor.h"
 #include "flang-rt/type-code.h"
-#include "terminator.h"
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/pointer.h"
 #include <cstdlib>