Keep runtime CMake files in flang/

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

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

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

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

flang-rt/lib/FortranFloat128Math/random.cpp

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

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"
 

flang-rt/lib/flang_rt/CUDA/descriptor.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/ISO_Fortran_binding.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>

flang-rt/lib/flang_rt/ISO_Fortran_util.h

@@ -11,9 +11,9 @@
 
 // Internal utils for establishing CFI_cdesc_t descriptors.
 
+#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 <cstdlib>
 

flang-rt/lib/flang_rt/allocatable.cpp

@@ -9,10 +9,10 @@
 #include "flang/Runtime/allocatable.h"
 #include "assign-impl.h"
 #include "derived.h"
-#include "flang-rt/descriptor.h"
 #include "stat.h"
 #include "terminator.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/assign.h"
 

flang-rt/lib/flang_rt/array-constructor.cpp

@@ -8,10 +8,10 @@
 
 #include "flang-rt/array-constructor.h"
 #include "derived.h"
-#include "flang-rt/descriptor.h"
 #include "terminator.h"
 #include "tools.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Runtime/allocatable.h"
 #include "flang/Runtime/assign.h"
 

flang-rt/lib/flang_rt/assign.cpp

@@ -9,11 +9,11 @@
 #include "flang/Runtime/assign.h"
 #include "assign-impl.h"
 #include "derived.h"
-#include "flang-rt/descriptor.h"
 #include "stat.h"
 #include "terminator.h"
 #include "tools.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 
 namespace Fortran::runtime {
 

flang-rt/lib/flang_rt/buffer.h

@@ -11,8 +11,8 @@
 #ifndef FLANG_RT_BUFFER_H_
 #define FLANG_RT_BUFFER_H_
 
-#include "flang-rt/memory.h"
 #include "io-error.h"
+#include "flang-rt/memory.h"
 #include "flang/Runtime/freestanding-tools.h"
 #include <algorithm>
 #include <cinttypes>

flang-rt/lib/flang_rt/character.cpp

@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/character.h"
-#include "flang-rt/descriptor.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Common/bit-population-count.h"
 #include "flang/Common/uint128.h"
 #include "flang/Runtime/character.h"

flang-rt/lib/flang_rt/command.cpp

@@ -8,10 +8,10 @@
 
 #include "flang/Runtime/command.h"
 #include "environment.h"
-#include "flang-rt/descriptor.h"
 #include "stat.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include <cstdlib>
 #include <limits>
 

flang-rt/lib/flang_rt/copy.cpp

@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "copy.h"
-#include "flang-rt/descriptor.h"
 #include "stack.h"
 #include "terminator.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Runtime/allocatable.h"
 #include <cstring>
 

flang-rt/lib/flang_rt/derived-api.cpp

@@ -8,10 +8,10 @@
 
 #include "flang/Runtime/derived-api.h"
 #include "derived.h"
-#include "flang-rt/descriptor.h"
 #include "terminator.h"
 #include "tools.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 
 namespace Fortran::runtime {
 

flang-rt/lib/flang_rt/derived.cpp

@@ -7,11 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "derived.h"
-#include "flang-rt/descriptor.h"
 #include "stat.h"
 #include "terminator.h"
 #include "tools.h"
 #include "type-info.h"
+#include "flang-rt/descriptor.h"
 
 namespace Fortran::runtime {
 

flang-rt/lib/flang_rt/descriptor-io.h

@@ -16,12 +16,12 @@
 
 #include "edit-input.h"
 #include "edit-output.h"
-#include "flang-rt/descriptor.h"
 #include "io-stmt.h"
 #include "namelist.h"
 #include "terminator.h"
 #include "type-info.h"
 #include "unit.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Common/optional.h"
 #include "flang/Common/uint128.h"
 #include "flang/Runtime/cpp-type.h"

flang-rt/lib/flang_rt/descriptor.cpp

@@ -9,12 +9,12 @@
 #include "flang-rt/descriptor.h"
 #include "ISO_Fortran_util.h"
 #include "derived.h"
-#include "flang-rt/allocator-registry.h"
 #include "memory.h"
 #include "stat.h"
 #include "terminator.h"
 #include "tools.h"
 #include "type-info.h"
+#include "flang-rt/allocator-registry.h"
 #include <cassert>
 #include <cstdlib>
 #include <cstring>

flang-rt/lib/flang_rt/dot-product.cpp

@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang-rt/descriptor.h"
 #include "float.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Common/float128.h"
 #include "flang/Runtime/cpp-type.h"
 #include "flang/Runtime/reduction.h"

flang-rt/lib/flang_rt/execute.cpp

@@ -8,10 +8,10 @@
 
 #include "flang/Runtime/execute.h"
 #include "environment.h"
-#include "flang-rt/descriptor.h"
 #include "stat.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include <cstdlib>
 #include <errno.h>
 #include <future>

flang-rt/lib/flang_rt/extensions.cpp

@@ -10,9 +10,9 @@
 // extensions that will eventually be implemented in Fortran.
 
 #include "flang/Runtime/extensions.h"
-#include "flang-rt/descriptor.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Runtime/command.h"
 #include "flang/Runtime/entry-names.h"
 #include "flang/Runtime/io-api.h"

flang-rt/lib/flang_rt/file.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "file.h"
-#include "flang-rt/memory.h"
 #include "tools.h"
+#include "flang-rt/memory.h"
 #include "flang/Runtime/magic-numbers.h"
 #include <algorithm>
 #include <cerrno>

flang-rt/lib/flang_rt/file.h

@@ -11,8 +11,8 @@
 #ifndef FLANG_RT_FILE_H_
 #define FLANG_RT_FILE_H_
 
-#include "flang-rt/memory.h"
 #include "io-error.h"
+#include "flang-rt/memory.h"
 #include "flang/Common/optional.h"
 #include <cinttypes>
 

flang-rt/lib/flang_rt/inquiry.cpp

@@ -11,9 +11,9 @@
 
 #include "flang/Runtime/inquiry.h"
 #include "copy.h"
-#include "flang-rt/descriptor.h"
 #include "terminator.h"
 #include "tools.h"
+#include "flang-rt/descriptor.h"
 #include <algorithm>
 
 namespace Fortran::runtime {

flang-rt/lib/flang_rt/internal-unit.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "internal-unit.h"
-#include "flang-rt/descriptor.h"
 #include "io-error.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Runtime/freestanding-tools.h"
 #include <algorithm>
 #include <type_traits>

flang-rt/lib/flang_rt/io-api.cpp

@@ -18,14 +18,14 @@
 #include "edit-input.h"
 #include "edit-output.h"
 #include "environment.h"
-#include "flang-rt/descriptor.h"
-#include "flang-rt/memory.h"
 #include "format.h"
 #include "io-api-common.h"
 #include "io-stmt.h"
 #include "terminator.h"
 #include "tools.h"
 #include "unit.h"
+#include "flang-rt/descriptor.h"
+#include "flang-rt/memory.h"
 #include "flang/Common/optional.h"
 #include <cstdlib>
 #include <memory>

flang-rt/lib/flang_rt/io-error.h

@@ -15,8 +15,8 @@
 #ifndef FLANG_RT_IO_ERROR_H_
 #define FLANG_RT_IO_ERROR_H_
 
-#include "flang-rt/memory.h"
 #include "terminator.h"
+#include "flang-rt/memory.h"
 #include "flang/Runtime/iostat.h"
 #include <cinttypes>
 

flang-rt/lib/flang_rt/io-stmt.cpp

@@ -9,11 +9,11 @@
 #include "io-stmt.h"
 #include "connection.h"
 #include "emit-encoded.h"
-#include "flang-rt/memory.h"
 #include "format.h"
 #include "tools.h"
 #include "unit.h"
 #include "utf.h"
+#include "flang-rt/memory.h"
 #include <algorithm>
 #include <cstdio>
 #include <cstring>

flang-rt/lib/flang_rt/io-stmt.h

@@ -13,10 +13,10 @@
 
 #include "connection.h"
 #include "file.h"
-#include "flang-rt/descriptor.h"
 #include "format.h"
 #include "internal-unit.h"
 #include "io-error.h"
+#include "flang-rt/descriptor.h"
 #include "flang/Common/optional.h"
 #include "flang/Common/reference-wrapper.h"
 #include "flang/Common/visit.h"