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

Author: Meinersbur

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

@@ -12,7 +12,7 @@
 #ifndef FLANG_RT_ARRAY_CONSTRUCTOR_H_
 #define FLANG_RT_ARRAY_CONSTRUCTOR_H_
 
-#include "flang-rt/descriptor.h"
+#include "descriptor.h"
 #include "flang/Runtime/array-constructor-consts.h"
 #include "flang/Runtime/entry-names.h"
 #include <cstdint>
@@ -44,6 +44,14 @@ struct ArrayConstructorVector {
   unsigned char useValueLengthParameters_ : 1;
 };
 
+static_assert(sizeof(Fortran::runtime::ArrayConstructorVector) <=
+        MaxArrayConstructorVectorSizeInBytes,
+    "ABI requires sizeof(ArrayConstructorVector) to be smaller than "
+    "MaxArrayConstructorVectorSizeInBytes");
+static_assert(alignof(Fortran::runtime::ArrayConstructorVector) <=
+        MaxArrayConstructorVectorAlignInBytes,
+    "ABI requires alignof(ArrayConstructorVector) to be smaller than "
+    "MaxArrayConstructorVectorAlignInBytes");
 
 } // namespace Fortran::runtime
 #endif /* FLANG_RT_ARRAY_CONSTRUCTOR_H_ */

flang-rt/lib/flang_rt/assign-impl.h renamed to flang-rt/include/flang-rt/assign-impl.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/assign-impl.h ------------------------------*- C++ -*-===//
+//===-- include/flang-rt/assign-impl.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-rt/lib/flang_rt/buffer.h renamed to flang-rt/include/flang-rt/buffer.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/buffer.h -----------------------------------*- C++ -*-===//
+//===-- include/flang-rt/buffer.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.
@@ -12,7 +12,7 @@
 #define FLANG_RT_BUFFER_H_
 
 #include "io-error.h"
-#include "flang-rt/memory.h"
+#include "memory.h"
 #include "flang/Runtime/freestanding-tools.h"
 #include <algorithm>
 #include <cinttypes>

flang-rt/lib/flang_rt/connection.h renamed to flang-rt/include/flang-rt/connection.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/connection.h -------------------------------*- C++ -*-===//
+//===-- include/flang-rt/connection.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-rt/lib/flang_rt/derived.h renamed to flang-rt/include/flang-rt/derived.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/derived.h ----------------------------------*- C++ -*-===//
+//===-- include/flang-rt/derived.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-rt/include/flang-rt/descriptor.h

@@ -18,8 +18,8 @@
 // User C code is welcome to depend on that ISO_Fortran_binding.h file,
 // but should never reference this internal header.
 
-#include "flang-rt/memory.h"
-#include "flang-rt/type-code.h"
+#include "memory.h"
+#include "type-code.h"
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/descriptor-consts.h"
 #include <algorithm>

flang-rt/lib/flang_rt/emit-encoded.h renamed to flang-rt/include/flang-rt/emit-encoded.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/emit-encoded.h -----------------------------*- C++ -*-===//
+//===-- include/flang-rt/emit-encoded.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-rt/lib/flang_rt/environment.h renamed to flang-rt/include/flang-rt/environment.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/environment.h ------------------------------*- C++ -*-===//
+//===-- include/flang-rt/environment.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-rt/lib/flang_rt/file.h renamed to flang-rt/include/flang-rt/file.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/file.h -------------------------------------*- C++ -*-===//
+//===-- include/flang-rt/file.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.
@@ -12,7 +12,7 @@
 #define FLANG_RT_FILE_H_
 
 #include "io-error.h"
-#include "flang-rt/memory.h"
+#include "memory.h"
 #include "flang/Common/optional.h"
 #include <cinttypes>
 

flang-rt/lib/flang_rt/format-implementation.h renamed to flang-rt/include/flang-rt/format-implementation.h

@@ -1,4 +1,4 @@
-//===-- lib/flang_rt/format-implementation.h --------------------*- C++ -*-===//
+//===-- include/flang-rt/format-implementation.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.