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

Author: Meinersbur

flang-rt/include/flang-rt/array-constructor.h

@@ -44,5 +44,6 @@ struct ArrayConstructorVector {
   unsigned char useValueLengthParameters_ : 1;
 };
 
+
 } // namespace Fortran::runtime
 #endif /* FLANG_RT_ARRAY_CONSTRUCTOR_H_ */

flang-rt/include/flang-rt/io-api-funcs.h

@@ -11,11 +11,11 @@
 
 #include "flang/Runtime/extensions.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "terminator.h"
 #include "tools.h"
 #include "flang/Runtime/command.h"
 #include "flang/Runtime/entry-names.h"
+#include "flang/Runtime/io-api.h"
 #include <chrono>
 #include <cstring>
 #include <ctime>

flang-rt/include/flang-rt/iostat-funcs.h

@@ -9,12 +9,12 @@
 #ifndef FLANG_RT_IO_API_COMMON_H_
 #define FLANG_RT_IO_API_COMMON_H_
 
-#include "flang-rt/io-api-funcs.h"
 #include "io-stmt.h"
 #include "terminator.h"
 #include "unit.h"
 #include "flang/Common/api-attrs.h"
 #include "flang/Common/optional.h"
+#include "flang/Runtime/io-api.h"
 
 namespace Fortran::runtime::io {
 

flang-rt/lib/flang_rt/extensions.cpp

@@ -10,13 +10,13 @@
 // list-directed output (PRINT *) of intrinsic types.
 
 #include "edit-output.h"
-#include "flang-rt/io-api-funcs.h"
 #include "format.h"
 #include "io-api-common.h"
 #include "io-stmt.h"
 #include "terminator.h"
 #include "tools.h"
 #include "unit.h"
+#include "flang/Runtime/io-api.h"
 
 namespace Fortran::runtime::io {
 RT_EXT_API_GROUP_BEGIN

flang-rt/lib/flang_rt/io-api-common.h

@@ -13,12 +13,12 @@
 // OutputReal{32,64}, OutputComplex{32,64}, OutputAscii, & EndIoStatement()
 // are in runtime/io-api-minimal.cpp.
 
+#include "flang/Runtime/io-api.h"
 #include "descriptor-io.h"
 #include "edit-input.h"
 #include "edit-output.h"
 #include "environment.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "flang-rt/memory.h"
 #include "format.h"
 #include "io-api-common.h"

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

@@ -15,9 +15,9 @@
 #ifndef FLANG_RT_IO_ERROR_H_
 #define FLANG_RT_IO_ERROR_H_
 
-#include "flang-rt/iostat-funcs.h"
 #include "flang-rt/memory.h"
 #include "terminator.h"
+#include "flang/Runtime/iostat.h"
 #include <cinttypes>
 
 namespace Fortran::runtime::io {

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

@@ -14,13 +14,13 @@
 #include "connection.h"
 #include "file.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "format.h"
 #include "internal-unit.h"
 #include "io-error.h"
 #include "flang/Common/optional.h"
 #include "flang/Common/reference-wrapper.h"
 #include "flang/Common/visit.h"
+#include "flang/Runtime/io-api.h"
 #include <flang/Common/variant.h>
 #include <functional>
 #include <type_traits>

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

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang-rt/iostat-funcs.h"
+#include "flang/Runtime/iostat.h"
 
 namespace Fortran::runtime::io {
 RT_OFFLOAD_API_GROUP_BEGIN