Skip to content

Commit 7e369b5

Browse files
MeinersburMeinersbur
committed
[Flang][NFC] Move runtime library files to flang-rt
1 parent 875607f commit 7e369b5

File tree

217 files changed

+866
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+866
-776
lines changed

‎flang-rt/.clang-format‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
# See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
3+
BasedOnStyle: LLVM
4+
AlignAfterOpenBracket: DontAlign
5+
AlignEscapedNewlines: DontAlign
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: false
8+
AlignOperands: false
9+
AlignTrailingComments: false
10+
IncludeCategories:
11+
- Regex: '^<'
12+
Priority: 6
13+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
14+
Priority: 5
15+
- Regex: '^"flang/' # Headers shared with Flang
16+
Priority: 4
17+
- Regex: '^"flang-rt/' # Public Flang-RT headers
18+
Priority: 3
19+
- Regex: '^[^/]*$' # Private headers from same library
20+
Priority: 1
21+
- Regex: '.*' # Private headers from sibling libraries
22+
Priority: 2
23+
...
24+
25+
# vim:set filetype=yaml:

‎flang-rt/cmake/config.h.cmake.in‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*===-- cmake/config.cmake.in ---------------------------------------*- C -*-===
2+
*
3+
* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
* See https://llvm.org/LICENSE.txt for license information.
5+
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
*
7+
*===----------------------------------------------------------------------===*/
8+
9+
#ifndef FORTRAN_RUNTIME_CONFIG_H
10+
#define FORTRAN_RUNTIME_CONFIG_H
11+
12+
/* Define to 1 if you have the `strerror_r' function. */
13+
#cmakedefine01 HAVE_STRERROR_R
14+
15+
/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you
16+
don't. */
17+
#cmakedefine01 HAVE_DECL_STRERROR_S
18+
19+
#endif

‎flang/include/flang/Runtime/CUDA/allocator.h‎ renamed to ‎flang-rt/include/flang-rt/CUDA/allocator.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
//===-- include/flang/Runtime/CUDA/allocator.h ------------------*- C++ -*-===//
1+
//===-- include/flang-rt/CUDA/allocator.h -----------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_
10-
#define FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_
9+
#ifndef FLANG_RT_CUDA_ALLOCATOR_H_
10+
#define FLANG_RT_CUDA_ALLOCATOR_H_
1111

12-
#include "common.h"
12+
#include "flang/Runtime/CUDA/common.h"
1313
#include "flang/Runtime/descriptor-consts.h"
1414
#include "flang/Runtime/entry-names.h"
1515

@@ -33,4 +33,4 @@ void *CUFAllocUnified(std::size_t);
3333
void CUFFreeUnified(void *);
3434

3535
} // namespace Fortran::runtime::cuda
36-
#endif // FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_
36+
#endif /* FLANG_RT_CUDA_ALLOCATOR_H_ */

‎flang/include/flang/Runtime/allocator-registry.h‎ renamed to ‎flang-rt/include/flang-rt/allocator-registry.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
//===-- runtime/allocator-registry.h ----------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/allocator-registry.h -------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_
10-
#define FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_
9+
#ifndef FLANG_RT_ALLOCATOR_REGISTRY_H_
10+
#define FLANG_RT_ALLOCATOR_REGISTRY_H_
1111

1212
#include "flang/Common/api-attrs.h"
1313
#include "flang/Runtime/allocator-registry-consts.h"
@@ -55,4 +55,4 @@ RT_OFFLOAD_VAR_GROUP_END
5555

5656
} // namespace Fortran::runtime
5757

58-
#endif // FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_
58+
#endif /* FLANG_RT_ALLOCATOR_REGISTRY_H_ */

‎flang/include/flang/Runtime/array-constructor.h‎ renamed to ‎flang-rt/include/flang-rt/array-constructor.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- include/flang/Runtime/array-constructor.h ---------------*- C++ -*-===//
1+
//===-- include/flang-rt/array-constructor.h --------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,11 +9,11 @@
99
// External APIs to create temporary storage for array constructors when their
1010
// final extents or length parameters cannot be pre-computed.
1111

12-
#ifndef FORTRAN_RUNTIME_ARRAYCONSTRUCTOR_H_
13-
#define FORTRAN_RUNTIME_ARRAYCONSTRUCTOR_H_
12+
#ifndef FLANG_RT_ARRAY_CONSTRUCTOR_H_
13+
#define FLANG_RT_ARRAY_CONSTRUCTOR_H_
1414

15+
#include "descriptor.h"
1516
#include "flang/Runtime/array-constructor-consts.h"
16-
#include "flang/Runtime/descriptor.h"
1717
#include "flang/Runtime/entry-names.h"
1818
#include <cstdint>
1919

@@ -54,4 +54,4 @@ static_assert(alignof(Fortran::runtime::ArrayConstructorVector) <=
5454
"MaxArrayConstructorVectorAlignInBytes");
5555

5656
} // namespace Fortran::runtime
57-
#endif // FORTRAN_RUNTIME_ARRAYCONSTRUCTOR_H_
57+
#endif /* FLANG_RT_ARRAY_CONSTRUCTOR_H_ */

‎flang/runtime/assign-impl.h‎ renamed to ‎flang-rt/include/flang-rt/assign-impl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
//===-- runtime/assign-impl.h -----------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/assign-impl.h --------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_RUNTIME_ASSIGN_IMPL_H_
10-
#define FORTRAN_RUNTIME_ASSIGN_IMPL_H_
9+
#ifndef FLANG_RT_ASSIGN_IMPL_H_
10+
#define FLANG_RT_ASSIGN_IMPL_H_
1111

1212
#include "flang/Runtime/freestanding-tools.h"
1313

@@ -28,4 +28,4 @@ RT_API_ATTRS void DoFromSourceAssign(Descriptor &, const Descriptor &,
2828
#endif
2929

3030
} // namespace Fortran::runtime
31-
#endif // FORTRAN_RUNTIME_ASSIGN_IMPL_H_
31+
#endif /* FLANG_RT_ASSIGN_IMPL_H_ */

‎flang/runtime/buffer.h‎ renamed to ‎flang-rt/include/flang-rt/buffer.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/buffer.h ----------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/buffer.h -------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -8,12 +8,12 @@
88

99
// External file buffering
1010

11-
#ifndef FORTRAN_RUNTIME_BUFFER_H_
12-
#define FORTRAN_RUNTIME_BUFFER_H_
11+
#ifndef FLANG_RT_BUFFER_H_
12+
#define FLANG_RT_BUFFER_H_
1313

1414
#include "io-error.h"
15+
#include "memory.h"
1516
#include "flang/Runtime/freestanding-tools.h"
16-
#include "flang/Runtime/memory.h"
1717
#include <algorithm>
1818
#include <cinttypes>
1919
#include <cstring>
@@ -221,4 +221,4 @@ template <typename STORE, std::size_t minBuffer = 65536> class FileFrame {
221221
bool dirty_{false};
222222
};
223223
} // namespace Fortran::runtime::io
224-
#endif // FORTRAN_RUNTIME_BUFFER_H_
224+
#endif /* FLANG_RT_BUFFER_H_ */

‎flang/runtime/connection.h‎ renamed to ‎flang-rt/include/flang-rt/connection.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/connection.h ------------------------------------*- C++ -*-===//
1+
//===-- include/flang-rt/connection.h ---------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -8,8 +8,8 @@
88

99
// Fortran I/O connection state (abstracted over internal & external units)
1010

11-
#ifndef FORTRAN_RUNTIME_IO_CONNECTION_H_
12-
#define FORTRAN_RUNTIME_IO_CONNECTION_H_
11+
#ifndef FLANG_RT_CONNECTION_H_
12+
#define FLANG_RT_CONNECTION_H_
1313

1414
#include "format.h"
1515
#include "flang/Common/optional.h"
@@ -124,4 +124,4 @@ class SavedPosition {
124124
};
125125

126126
} // namespace Fortran::runtime::io
127-
#endif // FORTRAN_RUNTIME_IO_CONNECTION_H_
127+
#endif /* FLANG_RT_CONNECTION_H_ */

‎flang/runtime/derived.h‎ renamed to ‎flang-rt/include/flang-rt/derived.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/derived.h -------------------------------------------------===//
1+
//===-- include/flang-rt/derived.h ------------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -8,8 +8,8 @@
88

99
// Internal runtime utilities for derived type operations.
1010

11-
#ifndef FORTRAN_RUNTIME_DERIVED_H_
12-
#define FORTRAN_RUNTIME_DERIVED_H_
11+
#ifndef FLANG_RT_DERIVED_H_
12+
#define FLANG_RT_DERIVED_H_
1313

1414
#include "flang/Common/api-attrs.h"
1515

@@ -48,4 +48,4 @@ RT_API_ATTRS void Destroy(const Descriptor &, bool finalize,
4848
RT_API_ATTRS bool HasDynamicComponent(const Descriptor &);
4949

5050
} // namespace Fortran::runtime
51-
#endif // FORTRAN_RUNTIME_DERIVED_H_
51+
#endif /* FLANG_RT_DERIVED_H_ */

‎flang/include/flang/Runtime/descriptor.h‎ renamed to ‎flang-rt/include/flang-rt/descriptor.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
//===-- include/flang/Runtime/descriptor.h ----------------------*- C++ -*-===//
1+
//===-- include/flang-rt/descriptor.h ---------------------------*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_RUNTIME_DESCRIPTOR_H_
10-
#define FORTRAN_RUNTIME_DESCRIPTOR_H_
9+
#ifndef FLANG_RT_DESCRIPTOR_H_
10+
#define FLANG_RT_DESCRIPTOR_H_
1111

1212
// Defines data structures used during execution of a Fortran program
1313
// to implement nontrivial dummy arguments, pointers, allocatables,
@@ -18,10 +18,10 @@
1818
// User C code is welcome to depend on that ISO_Fortran_binding.h file,
1919
// but should never reference this internal header.
2020

21+
#include "memory.h"
22+
#include "type-code.h"
2123
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
2224
#include "flang/Runtime/descriptor-consts.h"
23-
#include "flang/Runtime/memory.h"
24-
#include "flang/Runtime/type-code.h"
2525
#include <algorithm>
2626
#include <cassert>
2727
#include <cinttypes>
@@ -482,4 +482,4 @@ class alignas(Descriptor) StaticDescriptor {
482482
};
483483

484484
} // namespace Fortran::runtime
485-
#endif // FORTRAN_RUNTIME_DESCRIPTOR_H_
485+
#endif /* FLANG_RT_DESCRIPTOR_H_ */

0 commit comments

Comments
 (0)