Skip to content

Commit 7cbde0c

Browse files
committed
Post-merge fixes
1 parent 02812d5 commit 7cbde0c

34 files changed

+80
-80
lines changed

flang-rt/lib/CufRuntime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#===-- runtime/CUDA/CMakeLists.txt -----------------------------------------===#
1+
#===-- lib/CufRuntime/CMakeLists.txt ---------------------------------------===#
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.

flang-rt/lib/CufRuntime/allocatable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/CUDA/allocatable.cpp --------------------------------------===//
1+
//===-- lib/CufRuntime/allocatable.cpp --------------------------*- 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.

flang-rt/lib/CufRuntime/allocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/CUDA/allocator.cpp ----------------------------------------===//
1+
//===-- lib/CufRuntime/allocator.cpp ----------------------------*- 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.

flang-rt/lib/CufRuntime/descriptor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/CUDA/descriptor.cpp ---------------------------------------===//
1+
//===-- lib/CufRuntime/descriptor.cpp ---------------------------*- 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.

flang-rt/lib/CufRuntime/memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===-- runtime/CUDA/memory.cpp -------------------------------------------===//
1+
//===-- lib/CufRuntime/memory.cpp -------------------------------*- 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.

flang-rt/lib/FortranFloat128Math/complex-math.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*
77
*===----------------------------------------------------------------------===*/
88

9-
#ifndef FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_
10-
#define FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_
9+
#ifndef FLANG_RT_FORTRANFLOAT128MATH_COMPLEX_MATH_H_
10+
#define FLANG_RT_FORTRANFLOAT128MATH_COMPLEX_MATH_H_
1111

1212
#include "flang/Common/float128.h"
1313
#include "flang/Runtime/entry-names.h"
@@ -59,4 +59,4 @@
5959
#error "Float128Math build with glibc>=2.26 is unsupported yet"
6060
#endif
6161

62-
#endif /* FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_ */
62+
#endif /* FLANG_RT_FORTRANFLOAT128MATH_COMPLEX_MATH_H_ */

flang-rt/lib/FortranFloat128Math/math-entries.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
10-
#define FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
9+
#ifndef FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
10+
#define FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_
1111
#include "terminator.h"
1212
#include "tools.h"
1313
#include "flang/Common/float128.h"
@@ -222,4 +222,4 @@ DEFINE_SIMPLE_ALIAS(Yn, ynl)
222222

223223
} // namespace Fortran::runtime
224224

225-
#endif /* FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_ */
225+
#endif /* FLANG_RT_FORTRANFLOAT128MATH_MATH_ENTRIES_H_ */

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
10-
#define FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
9+
#ifndef FLANG_RT_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
10+
#define FLANG_RT_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_
1111

1212
#include "math-entries.h"
1313
#include "numeric-templates.h"
@@ -52,4 +52,4 @@ template <> struct SQRTTy<F128Type> {
5252
};
5353

5454
} // namespace Fortran::runtime
55-
#endif /* FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ */
55+
#endif /* FLANG_RT_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ */

flang-rt/lib/flang_rt/assign-impl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
//===-- lib/Runtime/assign-impl.h -------------------------------*- C++ -*-===//
1+
//===-- lib/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
namespace Fortran::runtime {
1313
class Descriptor;
@@ -21,4 +21,4 @@ RT_API_ATTRS void DoFromSourceAssign(
2121
Descriptor &, const Descriptor &, Terminator &);
2222

2323
} // namespace Fortran::runtime
24-
#endif /* FORTRAN_RUNTIME_ASSIGN_IMPL_H_ */
24+
#endif /* FLANG_RT_ASSIGN_IMPL_H_ */

flang-rt/lib/flang_rt/complex-reduction.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* with C++ build compilers that don't support C's _Complex.
1212
*/
1313

14-
#ifndef FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_
15-
#define FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_
14+
#ifndef FLANG_RT_COMPLEX_REDUCTION_H_
15+
#define FLANG_RT_COMPLEX_REDUCTION_H_
1616

1717
#include "flang/Common/float128.h"
1818
#include "flang/Runtime/entry-names.h"
@@ -155,4 +155,4 @@ void RTNAME(ReduceComplex16DimValue)(
155155
REDUCE_DIM_ARGS(CFloat128ComplexType, CFloat128ComplexType_value_op));
156156
#endif
157157

158-
#endif /* FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_ */
158+
#endif /* FLANG_RT_COMPLEX_REDUCTION_H_ */

0 commit comments

Comments
 (0)