From 765c2f9ed768c30138e560567f73849d5bb66390 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Wed, 16 Oct 2024 12:01:09 +0200 Subject: [PATCH] FortranRuntime -> flang-rt --- {FortranRuntime => flang-rt}/.clang-format | 0 .../cmake/config.h.cmake.in | 0 .../include/flang-rt/CufRuntime}/allocator.h | 8 ++++---- .../flang-rt/flang_rt}/allocator-registry.h | 8 ++++---- .../flang-rt/flang_rt}/array-constructor.h | 10 +++++----- .../include/flang-rt/flang_rt}/descriptor.h | 12 ++++++------ .../include/flang-rt/flang_rt}/io-api-funcs.h | 8 ++++---- .../include/flang-rt/flang_rt}/iostat-funcs.h | 8 ++++---- .../include/flang-rt/flang_rt}/memory.h | 8 ++++---- .../include/flang-rt/flang_rt}/type-code.h | 8 ++++---- .../lib/CufRuntime}/CMakeLists.txt | 2 +- .../lib/CufRuntime}/allocator.cpp | 18 +++++++++--------- .../lib/CufRuntime}/descriptor.cpp | 6 +++--- .../lib/FortranFloat128Math}/CMakeLists.txt | 2 +- .../lib/FortranFloat128Math}/acos.cpp | 2 +- .../lib/FortranFloat128Math}/acosh.cpp | 2 +- .../lib/FortranFloat128Math}/asin.cpp | 2 +- .../lib/FortranFloat128Math}/asinh.cpp | 2 +- .../lib/FortranFloat128Math}/atan.cpp | 2 +- .../lib/FortranFloat128Math}/atan2.cpp | 2 +- .../lib/FortranFloat128Math}/atanh.cpp | 2 +- .../lib/FortranFloat128Math}/ceil.cpp | 2 +- .../lib/FortranFloat128Math}/complex-math.c | 2 +- .../lib/FortranFloat128Math}/complex-math.h | 8 ++++---- .../lib/FortranFloat128Math}/cos.cpp | 2 +- .../lib/FortranFloat128Math}/cosh.cpp | 2 +- .../lib/FortranFloat128Math}/erf.cpp | 2 +- .../lib/FortranFloat128Math}/erfc.cpp | 2 +- .../lib/FortranFloat128Math}/exp.cpp | 2 +- .../lib/FortranFloat128Math}/exponent.cpp | 2 +- .../lib/FortranFloat128Math}/floor.cpp | 2 +- .../lib/FortranFloat128Math}/fma.cpp | 2 +- .../lib/FortranFloat128Math}/fraction.cpp | 2 +- .../lib/FortranFloat128Math}/hypot.cpp | 2 +- .../lib/FortranFloat128Math}/j0.cpp | 2 +- .../lib/FortranFloat128Math}/j1.cpp | 2 +- .../lib/FortranFloat128Math}/jn.cpp | 2 +- .../lib/FortranFloat128Math}/lgamma.cpp | 2 +- .../lib/FortranFloat128Math}/llround.cpp | 2 +- .../lib/FortranFloat128Math}/log.cpp | 2 +- .../lib/FortranFloat128Math}/log10.cpp | 2 +- .../lib/FortranFloat128Math}/lround.cpp | 2 +- .../lib/FortranFloat128Math}/math-entries.h | 8 ++++---- .../lib/FortranFloat128Math}/mod-real.cpp | 2 +- .../lib/FortranFloat128Math}/modulo-real.cpp | 2 +- .../lib/FortranFloat128Math}/nearest.cpp | 2 +- .../lib/FortranFloat128Math}/norm2.cpp | 2 +- .../numeric-template-specs.h | 8 ++++---- .../lib/FortranFloat128Math}/pow.cpp | 2 +- .../lib/FortranFloat128Math}/random.cpp | 2 +- .../lib/FortranFloat128Math}/round.cpp | 2 +- .../lib/FortranFloat128Math}/rrspacing.cpp | 2 +- .../lib/FortranFloat128Math}/scale.cpp | 2 +- .../lib/FortranFloat128Math}/set-exponent.cpp | 2 +- .../lib/FortranFloat128Math}/sin.cpp | 2 +- .../lib/FortranFloat128Math}/sinh.cpp | 2 +- .../lib/FortranFloat128Math}/spacing.cpp | 2 +- .../lib/FortranFloat128Math}/sqrt.cpp | 2 +- .../lib/FortranFloat128Math}/tan.cpp | 2 +- .../lib/FortranFloat128Math}/tanh.cpp | 2 +- .../lib/FortranFloat128Math}/tgamma.cpp | 2 +- .../lib/FortranFloat128Math}/trunc.cpp | 2 +- .../lib/FortranFloat128Math}/y0.cpp | 2 +- .../lib/FortranFloat128Math}/y1.cpp | 2 +- .../lib/FortranFloat128Math}/yn.cpp | 2 +- .../lib/flang_rt}/CMakeLists.txt | 6 +++--- .../lib/flang_rt}/ISO_Fortran_binding.cpp | 6 +++--- .../lib/flang_rt}/ISO_Fortran_util.h | 12 ++++++------ .../lib/flang_rt}/allocatable.cpp | 4 ++-- .../lib/flang_rt}/allocator-registry.cpp | 4 ++-- .../lib/flang_rt}/array-constructor.cpp | 6 +++--- .../lib/flang_rt}/assign-impl.h | 0 .../lib/flang_rt}/assign.cpp | 4 ++-- .../lib/flang_rt}/buffer.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/buffer.h | 10 +++++----- .../lib/flang_rt}/character.cpp | 4 ++-- .../lib/flang_rt}/command.cpp | 4 ++-- .../lib/flang_rt}/complex-powi.cpp | 2 +- .../lib/flang_rt}/complex-reduction.c | 2 +- .../lib/flang_rt}/complex-reduction.h | 8 ++++---- .../lib/flang_rt}/connection.cpp | 2 +- .../lib/flang_rt}/connection.h | 8 ++++---- .../Runtime => flang-rt/lib/flang_rt}/copy.cpp | 4 ++-- .../Runtime => flang-rt/lib/flang_rt}/copy.h | 10 +++++----- .../lib/flang_rt}/derived-api.cpp | 4 ++-- .../lib/flang_rt}/derived.cpp | 4 ++-- .../lib/flang_rt}/derived.h | 8 ++++---- .../lib/flang_rt}/descriptor-io.cpp | 2 +- .../lib/flang_rt}/descriptor-io.h | 10 +++++----- .../lib/flang_rt}/descriptor.cpp | 6 +++--- .../lib/flang_rt}/dot-product.cpp | 4 ++-- .../lib/flang_rt}/edit-input.cpp | 2 +- .../lib/flang_rt}/edit-input.h | 8 ++++---- .../lib/flang_rt}/edit-output.cpp | 2 +- .../lib/flang_rt}/edit-output.h | 8 ++++---- .../lib/flang_rt}/emit-encoded.h | 8 ++++---- .../lib/flang_rt}/environment-default-list.h | 0 .../lib/flang_rt}/environment.cpp | 2 +- .../lib/flang_rt}/environment.h | 8 ++++---- .../lib/flang_rt}/exceptions.cpp | 2 +- .../lib/flang_rt}/execute.cpp | 4 ++-- .../lib/flang_rt}/extensions.cpp | 6 +++--- .../lib/flang_rt}/external-unit.cpp | 2 +- .../lib/flang_rt}/extrema.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/file.cpp | 4 ++-- .../Runtime => flang-rt/lib/flang_rt}/file.h | 10 +++++----- .../lib/flang_rt}/findloc.cpp | 2 +- .../lib/flang_rt}/format-implementation.h | 8 ++++---- .../lib/flang_rt}/format.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/format.h | 8 ++++---- .../lib/flang_rt}/inquiry.cpp | 4 ++-- .../lib/flang_rt}/internal-unit.cpp | 4 ++-- .../lib/flang_rt}/internal-unit.h | 10 +++++----- .../lib/flang_rt}/io-api-common.h | 10 +++++----- .../lib/flang_rt}/io-api-minimal.cpp | 4 ++-- .../lib/flang_rt}/io-api.cpp | 8 ++++---- .../lib/flang_rt}/io-error.cpp | 2 +- .../lib/flang_rt}/io-error.h | 12 ++++++------ .../lib/flang_rt}/io-stmt.cpp | 4 ++-- .../lib/flang_rt}/io-stmt.h | 12 ++++++------ .../lib/flang_rt}/iostat.cpp | 4 ++-- .../Runtime => flang-rt/lib/flang_rt}/lock.h | 8 ++++---- .../Runtime => flang-rt/lib/flang_rt}/main.cpp | 2 +- .../lib/flang_rt}/matmul-transpose.cpp | 4 ++-- .../lib/flang_rt}/matmul.cpp | 4 ++-- .../lib/flang_rt}/memory.cpp | 4 ++-- .../lib/flang_rt}/misc-intrinsic.cpp | 4 ++-- .../lib/flang_rt}/namelist.cpp | 4 ++-- .../lib/flang_rt}/namelist.h | 8 ++++---- .../lib/flang_rt}/non-tbp-dio.cpp | 2 +- .../lib/flang_rt}/non-tbp-dio.h | 8 ++++---- .../lib/flang_rt}/numeric-templates.h | 8 ++++---- .../lib/flang_rt}/numeric.cpp | 2 +- .../lib/flang_rt}/pointer.cpp | 2 +- .../lib/flang_rt}/product.cpp | 2 +- .../lib/flang_rt}/pseudo-unit.cpp | 2 +- .../lib/flang_rt}/ragged.cpp | 2 +- .../lib/flang_rt}/random-templates.h | 10 +++++----- .../lib/flang_rt}/random.cpp | 4 ++-- .../lib/flang_rt}/reduce.cpp | 4 ++-- .../lib/flang_rt}/reduction-templates.h | 10 +++++----- .../lib/flang_rt}/reduction.cpp | 4 ++-- .../Runtime => flang-rt/lib/flang_rt}/stack.h | 10 +++++----- .../Runtime => flang-rt/lib/flang_rt}/stat.cpp | 4 ++-- .../Runtime => flang-rt/lib/flang_rt}/stat.h | 8 ++++---- .../Runtime => flang-rt/lib/flang_rt}/stop.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/sum.cpp | 2 +- .../lib/flang_rt}/support.cpp | 4 ++-- .../lib/flang_rt}/temporary-stack.cpp | 6 +++--- .../lib/flang_rt}/terminator.cpp | 2 +- .../lib/flang_rt}/terminator.h | 8 ++++---- .../lib/flang_rt}/time-intrinsic.cpp | 4 ++-- .../lib/flang_rt}/tools.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/tools.h | 12 ++++++------ .../lib/flang_rt}/transformational.cpp | 4 ++-- .../lib/flang_rt}/type-code.cpp | 4 ++-- .../lib/flang_rt}/type-info.cpp | 2 +- .../lib/flang_rt}/type-info.h | 10 +++++----- .../lib/flang_rt}/unit-map.cpp | 2 +- .../lib/flang_rt}/unit-map.h | 10 +++++----- .../Runtime => flang-rt/lib/flang_rt}/unit.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/unit.h | 10 +++++----- .../Runtime => flang-rt/lib/flang_rt}/utf.cpp | 2 +- .../Runtime => flang-rt/lib/flang_rt}/utf.h | 8 ++++---- .../test/Driver/ctofortran.f90 | 0 .../test/Driver/exec.f90 | 0 .../test/Runtime/no-cpp-dep.c | 0 .../unittests/Evaluate/CMakeLists.txt | 0 .../unittests/Evaluate/ISO-Fortran-binding.cpp | 2 +- .../unittests/Evaluate/reshape.cpp | 2 +- .../unittests/Runtime/AccessTest.cpp | 0 .../unittests/Runtime/Allocatable.cpp | 0 .../unittests/Runtime/ArrayConstructor.cpp | 6 +++--- .../unittests/Runtime/BufferTest.cpp | 2 +- .../unittests/Runtime/CMakeLists.txt | 0 .../unittests/Runtime/CUDA/AllocatorCUF.cpp | 14 +++++++------- .../unittests/Runtime/CUDA/CMakeLists.txt | 0 .../unittests/Runtime/CharacterTest.cpp | 2 +- .../unittests/Runtime/CommandTest.cpp | 2 +- .../unittests/Runtime/Complex.cpp | 0 .../unittests/Runtime/CrashHandlerFixture.cpp | 2 +- .../unittests/Runtime/CrashHandlerFixture.h | 0 .../unittests/Runtime/Derived.cpp | 2 +- .../unittests/Runtime/ExternalIOTest.cpp | 4 ++-- .../unittests/Runtime/Format.cpp | 6 +++--- .../unittests/Runtime/Inquiry.cpp | 2 +- .../unittests/Runtime/ListInputTest.cpp | 6 +++--- .../unittests/Runtime/LogicalFormatTest.cpp | 4 ++-- .../unittests/Runtime/Matmul.cpp | 4 ++-- .../unittests/Runtime/MatmulTranspose.cpp | 4 ++-- .../unittests/Runtime/MiscIntrinsic.cpp | 2 +- .../unittests/Runtime/Namelist.cpp | 6 +++--- .../unittests/Runtime/Numeric.cpp | 0 .../unittests/Runtime/NumericalFormatTest.cpp | 4 ++-- .../unittests/Runtime/Pointer.cpp | 2 +- .../unittests/Runtime/Ragged.cpp | 0 .../unittests/Runtime/Random.cpp | 4 ++-- .../unittests/Runtime/Reduction.cpp | 4 ++-- .../unittests/Runtime/RuntimeCrashTest.cpp | 2 +- .../unittests/Runtime/Stop.cpp | 2 +- .../unittests/Runtime/Support.cpp | 2 +- .../unittests/Runtime/TemporaryStack.cpp | 4 ++-- .../unittests/Runtime/Time.cpp | 0 .../unittests/Runtime/Transformational.cpp | 2 +- .../unittests/Runtime/tools.h | 4 ++-- flang/CMakeLists.txt | 2 +- flang/include/flang/Common/README.md | 4 +++- flang/include/flang/ISO_Fortran_binding.h | 16 ++++++++++++---- flang/include/flang/Runtime/README.md | 2 +- flang/include/flang/Testing/README.md | 4 +++- flang/lib/Common/README.md | 4 +++- .../Optimizer/Transforms/CufOpConversion.cpp | 2 +- flang/lib/Testing/README.md | 2 +- flang/unittests/CMakeLists.txt | 4 ++-- flang/unittests/Evaluate/CMakeLists.txt | 2 +- 215 files changed, 445 insertions(+), 431 deletions(-) rename {FortranRuntime => flang-rt}/.clang-format (100%) rename {FortranRuntime => flang-rt}/cmake/config.h.cmake.in (100%) rename {flang/include/flang/Runtime/CUDA => flang-rt/include/flang-rt/CufRuntime}/allocator.h (85%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/allocator-registry.h (87%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/array-constructor.h (85%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/descriptor.h (98%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/io-api-funcs.h (84%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/iostat-funcs.h (75%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/memory.h (96%) rename {FortranRuntime/include/FortranRuntime/Runtime => flang-rt/include/flang-rt/flang_rt}/type-code.h (93%) rename {FortranRuntime/lib/Runtime/CUDA => flang-rt/lib/CufRuntime}/CMakeLists.txt (93%) rename {FortranRuntime/lib/Runtime/CUDA => flang-rt/lib/CufRuntime}/allocator.cpp (81%) rename {FortranRuntime/lib/Runtime/CUDA => flang-rt/lib/CufRuntime}/descriptor.cpp (82%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/CMakeLists.txt (98%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/acos.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/acosh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/asin.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/asinh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/atan.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/atan2.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/atanh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/ceil.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/complex-math.c (96%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/complex-math.h (88%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/cos.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/cosh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/erf.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/erfc.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/exp.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/exponent.cpp (92%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/floor.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/fma.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/fraction.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/hypot.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/j0.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/j1.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/jn.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/lgamma.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/llround.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/log.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/log10.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/lround.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/math-entries.h (97%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/mod-real.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/modulo-real.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/nearest.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/norm2.cpp (94%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/numeric-template-specs.h (84%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/pow.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/random.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/round.cpp (92%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/rrspacing.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/scale.cpp (92%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/set-exponent.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/sin.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/sinh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/spacing.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/sqrt.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/tan.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/tanh.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/tgamma.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/trunc.cpp (91%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/y0.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/y1.cpp (90%) rename {FortranRuntime/lib/Runtime/Float128Math => flang-rt/lib/FortranFloat128Math}/yn.cpp (90%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/CMakeLists.txt (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/ISO_Fortran_binding.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/ISO_Fortran_util.h (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/allocatable.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/allocator-registry.cpp (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/array-constructor.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/assign-impl.h (100%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/assign.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/buffer.cpp (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/buffer.h (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/character.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/command.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/complex-powi.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/complex-reduction.c (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/complex-reduction.h (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/connection.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/connection.h (96%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/copy.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/copy.h (78%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/derived-api.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/derived.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/derived.h (88%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/descriptor-io.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/descriptor-io.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/descriptor.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/dot-product.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/edit-input.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/edit-input.h (90%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/edit-output.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/edit-output.h (96%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/emit-encoded.h (94%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/environment-default-list.h (100%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/environment.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/environment.h (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/exceptions.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/execute.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/extensions.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/external-unit.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/extrema.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/file.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/file.h (94%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/findloc.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/format-implementation.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/format.cpp (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/format.h (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/inquiry.cpp (96%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/internal-unit.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/internal-unit.h (89%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-api-common.h (92%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-api-minimal.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-api.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-error.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-error.h (90%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-stmt.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/io-stmt.h (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/iostat.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/lock.h (94%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/main.cpp (95%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/matmul-transpose.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/matmul.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/memory.cpp (92%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/misc-intrinsic.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/namelist.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/namelist.h (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/non-tbp-dio.cpp (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/non-tbp-dio.h (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/numeric-templates.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/numeric.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/pointer.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/product.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/pseudo-unit.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/ragged.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/random-templates.h (91%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/random.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/reduce.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/reduction-templates.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/reduction.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/stack.h (94%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/stat.cpp (96%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/stat.h (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/stop.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/sum.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/support.cpp (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/temporary-stack.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/terminator.cpp (97%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/terminator.h (95%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/time-intrinsic.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/tools.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/tools.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/transformational.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/type-code.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/type-info.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/type-info.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/unit-map.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/unit-map.h (93%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/unit.cpp (99%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/unit.h (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/utf.cpp (98%) rename {FortranRuntime/lib/Runtime => flang-rt/lib/flang_rt}/utf.h (94%) rename {FortranRuntime => flang-rt}/test/Driver/ctofortran.f90 (100%) rename {FortranRuntime => flang-rt}/test/Driver/exec.f90 (100%) rename {FortranRuntime => flang-rt}/test/Runtime/no-cpp-dep.c (100%) rename {FortranRuntime => flang-rt}/unittests/Evaluate/CMakeLists.txt (100%) rename {FortranRuntime => flang-rt}/unittests/Evaluate/ISO-Fortran-binding.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Evaluate/reshape.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/AccessTest.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Allocatable.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/ArrayConstructor.cpp (97%) rename {FortranRuntime => flang-rt}/unittests/Runtime/BufferTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CMakeLists.txt (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CUDA/AllocatorCUF.cpp (90%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CUDA/CMakeLists.txt (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CharacterTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CommandTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Complex.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CrashHandlerFixture.cpp (96%) rename {FortranRuntime => flang-rt}/unittests/Runtime/CrashHandlerFixture.h (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Derived.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/ExternalIOTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Format.cpp (97%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Inquiry.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/ListInputTest.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/LogicalFormatTest.cpp (95%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Matmul.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/MatmulTranspose.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/MiscIntrinsic.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Namelist.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Numeric.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/NumericalFormatTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Pointer.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Ragged.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Random.cpp (95%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Reduction.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/RuntimeCrashTest.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Stop.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Support.cpp (98%) rename {FortranRuntime => flang-rt}/unittests/Runtime/TemporaryStack.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Time.cpp (100%) rename {FortranRuntime => flang-rt}/unittests/Runtime/Transformational.cpp (99%) rename {FortranRuntime => flang-rt}/unittests/Runtime/tools.h (95%) diff --git a/FortranRuntime/.clang-format b/flang-rt/.clang-format similarity index 100% rename from FortranRuntime/.clang-format rename to flang-rt/.clang-format diff --git a/FortranRuntime/cmake/config.h.cmake.in b/flang-rt/cmake/config.h.cmake.in similarity index 100% rename from FortranRuntime/cmake/config.h.cmake.in rename to flang-rt/cmake/config.h.cmake.in diff --git a/flang/include/flang/Runtime/CUDA/allocator.h b/flang-rt/include/flang-rt/CufRuntime/allocator.h similarity index 85% rename from flang/include/flang/Runtime/CUDA/allocator.h rename to flang-rt/include/flang-rt/CufRuntime/allocator.h index cc88896b1f0bd6..63406e0de6d2fa 100644 --- a/flang/include/flang/Runtime/CUDA/allocator.h +++ b/flang-rt/include/flang-rt/CufRuntime/allocator.h @@ -1,4 +1,4 @@ -//===-- include/flang/Runtime/CUDA/allocator.h ------------------*- C++ -*-===// +//===-- include/flang-rt/CufRuntime/allocator.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_ -#define FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_ +#ifndef FORTRAN_CUFRUNTIME_ALLOCATOR_H_ +#define FORTRAN_CUFRUNTIME_ALLOCATOR_H_ #include "flang/Runtime/descriptor-consts.h" #include "flang/Runtime/entry-names.h" @@ -43,4 +43,4 @@ void *CUFAllocUnified(std::size_t); void CUFFreeUnified(void *); } // namespace Fortran::runtime::cuda -#endif // FORTRAN_RUNTIME_CUDA_ALLOCATOR_H_ +#endif /* FORTRAN_CUFRUNTIME_ALLOCATOR_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/allocator-registry.h b/flang-rt/include/flang-rt/flang_rt/allocator-registry.h similarity index 87% rename from FortranRuntime/include/FortranRuntime/Runtime/allocator-registry.h rename to flang-rt/include/flang-rt/flang_rt/allocator-registry.h index 30a583b88c083e..ecad61ab4043d7 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/allocator-registry.h +++ b/flang-rt/include/flang-rt/flang_rt/allocator-registry.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/allocator-registry.h -----*- C++ -*-===// +//===-- include/flang-rt/flang_rt/allocator-registry.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_ -#define FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_ +#ifndef FORTRAN_FLANG_RT_ALLOCATOR_REGISTRY_H_ +#define FORTRAN_FLANG_RT_ALLOCATOR_REGISTRY_H_ #include "flang/Common/api-attrs.h" #include "flang/Runtime/allocator-registry-consts.h" @@ -55,4 +55,4 @@ RT_OFFLOAD_VAR_GROUP_END } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_ALLOCATOR_REGISTRY_H_ */ +#endif /* FORTRAN_FLANG_RT_ALLOCATOR_REGISTRY_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/array-constructor.h b/flang-rt/include/flang-rt/flang_rt/array-constructor.h similarity index 85% rename from FortranRuntime/include/FortranRuntime/Runtime/array-constructor.h rename to flang-rt/include/flang-rt/flang_rt/array-constructor.h index 314d5e56599cd3..e8fffc762b6fbe 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/array-constructor.h +++ b/flang-rt/include/flang-rt/flang_rt/array-constructor.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/array-constructor.h ------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/array-constructor.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. @@ -9,10 +9,10 @@ // External APIs to create temporary storage for array constructors when their // final extents or length parameters cannot be pre-computed. -#ifndef FORTRAN_RUNTIME_ARRAY_CONSTRUCTOR_H_ -#define FORTRAN_RUNTIME_ARRAY_CONSTRUCTOR_H_ +#ifndef FORTRAN_FLANG_RT_ARRAY_CONSTRUCTOR_H_ +#define FORTRAN_FLANG_RT_ARRAY_CONSTRUCTOR_H_ -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "flang/Runtime/array-constructor-consts.h" #include "flang/Runtime/entry-names.h" #include @@ -45,4 +45,4 @@ struct ArrayConstructorVector { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_ARRAY_CONSTRUCTOR_H_ */ +#endif /* FORTRAN_FLANG_RT_ARRAY_CONSTRUCTOR_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/descriptor.h b/flang-rt/include/flang-rt/flang_rt/descriptor.h similarity index 98% rename from FortranRuntime/include/FortranRuntime/Runtime/descriptor.h rename to flang-rt/include/flang-rt/flang_rt/descriptor.h index f79ad6b9637a4a..fea5b55c1922ce 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/descriptor.h +++ b/flang-rt/include/flang-rt/flang_rt/descriptor.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/descriptor.h -------------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/descriptor.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_DESCRIPTOR_H_ -#define FORTRAN_RUNTIME_DESCRIPTOR_H_ +#ifndef FORTRAN_FLANG_RT_DESCRIPTOR_H_ +#define FORTRAN_FLANG_RT_DESCRIPTOR_H_ // Defines data structures used during execution of a Fortran program // to implement nontrivial dummy arguments, pointers, allocatables, @@ -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 "FortranRuntime/Runtime/memory.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/memory.h" +#include "flang-rt/flang_rt/type-code.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "flang/Runtime/descriptor-consts.h" #include @@ -482,4 +482,4 @@ class alignas(Descriptor) StaticDescriptor { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_DESCRIPTOR_H_ */ +#endif /* FORTRAN_FLANG_RT_DESCRIPTOR_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/io-api-funcs.h b/flang-rt/include/flang-rt/flang_rt/io-api-funcs.h similarity index 84% rename from FortranRuntime/include/FortranRuntime/Runtime/io-api-funcs.h rename to flang-rt/include/flang-rt/flang_rt/io-api-funcs.h index 516fe25784656c..00cb49ad015437 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/io-api-funcs.h +++ b/flang-rt/include/flang-rt/flang_rt/io-api-funcs.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/io-api-funcs.h -----------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/io-api-funcs.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. @@ -8,8 +8,8 @@ // Defines API between compiled code and I/O runtime library. -#ifndef FORTRAN_RUNTIME_IO_API_FUNCS_H_ -#define FORTRAN_RUNTIME_IO_API_FUNCS_H_ +#ifndef FORTRAN_FLANG_RT_IO_API_FUNCS_H_ +#define FORTRAN_FLANG_RT_IO_API_FUNCS_H_ #include "flang/Common/uint128.h" #include "flang/Runtime/entry-names.h" @@ -36,4 +36,4 @@ RT_API_ATTRS const char *InquiryKeywordHashDecode( char *buffer, std::size_t, InquiryKeywordHash); } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_IO_API_FUNCS_H_ */ +#endif /* FORTRAN_FLANG_RT_IO_API_FUNCS_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/iostat-funcs.h b/flang-rt/include/flang-rt/flang_rt/iostat-funcs.h similarity index 75% rename from FortranRuntime/include/FortranRuntime/Runtime/iostat-funcs.h rename to flang-rt/include/flang-rt/flang_rt/iostat-funcs.h index 10906afb01673c..dd24d41fbaad10 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/iostat-funcs.h +++ b/flang-rt/include/flang-rt/flang_rt/iostat-funcs.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/iostat-funcs.h -----------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/iostat-funcs.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. @@ -9,8 +9,8 @@ // Defines the values returned by the runtime for IOSTAT= specifiers // on I/O statements. -#ifndef FORTRAN_RUNTIME_IOSTAT_FUNCS_H_ -#define FORTRAN_RUNTIME_IOSTAT_FUNCS_H_ +#ifndef FORTRAN_FLANG_RT_IOSTAT_FUNCS_H_ +#define FORTRAN_FLANG_RT_IOSTAT_FUNCS_H_ #include "flang/Common/api-attrs.h" #include "flang/Runtime/iostat.h" @@ -20,4 +20,4 @@ namespace Fortran::runtime::io { RT_API_ATTRS const char *IostatErrorString(int); } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_IOSTAT_FUNCS_H_ */ +#endif /* FORTRAN_FLANG_RT_IOSTAT_FUNCS_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/memory.h b/flang-rt/include/flang-rt/flang_rt/memory.h similarity index 96% rename from FortranRuntime/include/FortranRuntime/Runtime/memory.h rename to flang-rt/include/flang-rt/flang_rt/memory.h index 3e7fd2d9ea3e3b..b97f6525d60036 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/memory.h +++ b/flang-rt/include/flang-rt/flang_rt/memory.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/memory.h -----------------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/memory.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. @@ -9,8 +9,8 @@ // Thin wrapper around malloc()/free() to isolate the dependency, // ease porting, and provide an owning pointer. -#ifndef FORTRAN_RUNTIME_MEMORY_H_ -#define FORTRAN_RUNTIME_MEMORY_H_ +#ifndef FORTRAN_FLANG_RT_MEMORY_H_ +#define FORTRAN_FLANG_RT_MEMORY_H_ #include "flang/Common/api-attrs.h" #include @@ -170,4 +170,4 @@ template struct Allocator { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_MEMORY_H_ */ +#endif /* FORTRAN_FLANG_RT_MEMORY_H_ */ diff --git a/FortranRuntime/include/FortranRuntime/Runtime/type-code.h b/flang-rt/include/flang-rt/flang_rt/type-code.h similarity index 93% rename from FortranRuntime/include/FortranRuntime/Runtime/type-code.h rename to flang-rt/include/flang-rt/flang_rt/type-code.h index 92ff593410c12c..7c694a13431b13 100644 --- a/FortranRuntime/include/FortranRuntime/Runtime/type-code.h +++ b/flang-rt/include/flang-rt/flang_rt/type-code.h @@ -1,4 +1,4 @@ -//===-- include/FortranRuntime/Runtime/type-code.h --------------*- C++ -*-===// +//===-- include/flang-rt/flang_rt/type-code.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_TYPE_CODE_H_ -#define FORTRAN_RUNTIME_TYPE_CODE_H_ +#ifndef FORTRAN_FLANG_RT_TYPE_CODE_H_ +#define FORTRAN_FLANG_RT_TYPE_CODE_H_ #include "flang/Common/Fortran-consts.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" @@ -75,4 +75,4 @@ class TypeCode { ISO::CFI_type_t raw_{CFI_type_other}; }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_TYPE_CODE_H_ */ +#endif /* FORTRAN_FLANG_RT_TYPE_CODE_H_ */ diff --git a/FortranRuntime/lib/Runtime/CUDA/CMakeLists.txt b/flang-rt/lib/CufRuntime/CMakeLists.txt similarity index 93% rename from FortranRuntime/lib/Runtime/CUDA/CMakeLists.txt rename to flang-rt/lib/CufRuntime/CMakeLists.txt index f75b854d1eb3ba..2b07b249007167 100644 --- a/FortranRuntime/lib/Runtime/CUDA/CMakeLists.txt +++ b/flang-rt/lib/CufRuntime/CMakeLists.txt @@ -1,4 +1,4 @@ -#===-- lib/Runtime/CUDA/CMakeLists.txt -------------------------------------===# +#===-- lib/CufRuntime/CMakeLists.txt ---------------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/CUDA/allocator.cpp b/flang-rt/lib/CufRuntime/allocator.cpp similarity index 81% rename from FortranRuntime/lib/Runtime/CUDA/allocator.cpp rename to flang-rt/lib/CufRuntime/allocator.cpp index c9d62f6ea8f3bf..8c16fb77f2ac46 100644 --- a/FortranRuntime/lib/Runtime/CUDA/allocator.cpp +++ b/flang-rt/lib/CufRuntime/allocator.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/CUDA/allocator.cpp --------------------------*- C++ -*-===// +//===-- lib/CufRuntime/allocator.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/CUDA/allocator.h" -#include "FortranRuntime/Runtime/allocator-registry.h" -#include "../derived.h" -#include "../stat.h" -#include "../terminator.h" -#include "../type-info.h" -#include "flang/ISO_Fortran_binding_wrapper.h" -#include "flang/Support/Fortran.h" +#include "flang-rt/CufRuntime/allocator.h" +#include "flang-rt/flang_rt/allocator-registry.h" +#include "../flang_rt/derived.h" +#include "../flang_rt/stat.h" +#include "../flang_rt/terminator.h" +#include "../flang_rt/type-info.h" +#include "flang/Common/Fortran-consts.h" +#include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "cuda_runtime.h" diff --git a/FortranRuntime/lib/Runtime/CUDA/descriptor.cpp b/flang-rt/lib/CufRuntime/descriptor.cpp similarity index 82% rename from FortranRuntime/lib/Runtime/CUDA/descriptor.cpp rename to flang-rt/lib/CufRuntime/descriptor.cpp index 94b5feca4ce4dc..b034fc76b67d4d 100644 --- a/FortranRuntime/lib/Runtime/CUDA/descriptor.cpp +++ b/flang-rt/lib/CufRuntime/descriptor.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/CUDA/descriptor.cpp -------------------------*- C++ -*-===// +//===-- lib/CufRuntime/descriptor.cpp ---------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/CUDA/descriptor.h" -#include "FortranRuntime/Runtime/CUDA/allocator.h" +#include "flang/Runtime/CUDA/descriptor.h" +#include "flang-rt/CufRuntime/allocator.h" namespace Fortran::runtime::cuda { extern "C" { diff --git a/FortranRuntime/lib/Runtime/Float128Math/CMakeLists.txt b/flang-rt/lib/FortranFloat128Math/CMakeLists.txt similarity index 98% rename from FortranRuntime/lib/Runtime/Float128Math/CMakeLists.txt rename to flang-rt/lib/FortranFloat128Math/CMakeLists.txt index 1ff158c401855f..756f07dd5b996d 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/CMakeLists.txt +++ b/flang-rt/lib/FortranFloat128Math/CMakeLists.txt @@ -1,4 +1,4 @@ -#===-- lib/Runtime/Float128Math/CMakeLists.txt -----------------------------===# +#===-- lib/FortranFloat128Math/CMakeLists.txt ------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/acos.cpp b/flang-rt/lib/FortranFloat128Math/acos.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/acos.cpp rename to flang-rt/lib/FortranFloat128Math/acos.cpp index 7b15e4a0bfd3ae..e204c6c871f3fa 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/acos.cpp +++ b/flang-rt/lib/FortranFloat128Math/acos.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/acos.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/acos.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/acosh.cpp b/flang-rt/lib/FortranFloat128Math/acosh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/acosh.cpp rename to flang-rt/lib/FortranFloat128Math/acosh.cpp index c873259b4545b8..90ff7886e6909d 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/acosh.cpp +++ b/flang-rt/lib/FortranFloat128Math/acosh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/acosh.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/acosh.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/asin.cpp b/flang-rt/lib/FortranFloat128Math/asin.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/asin.cpp rename to flang-rt/lib/FortranFloat128Math/asin.cpp index 8866d51430197a..18368044d72b0f 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/asin.cpp +++ b/flang-rt/lib/FortranFloat128Math/asin.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/asin.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/asin.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/asinh.cpp b/flang-rt/lib/FortranFloat128Math/asinh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/asinh.cpp rename to flang-rt/lib/FortranFloat128Math/asinh.cpp index 288193001ce1da..2c1f040cfc3872 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/asinh.cpp +++ b/flang-rt/lib/FortranFloat128Math/asinh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/asinh.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/asinh.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/atan.cpp b/flang-rt/lib/FortranFloat128Math/atan.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/atan.cpp rename to flang-rt/lib/FortranFloat128Math/atan.cpp index 390c080b4d501b..8bd9a2626caf83 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/atan.cpp +++ b/flang-rt/lib/FortranFloat128Math/atan.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/atan.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/atan.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/atan2.cpp b/flang-rt/lib/FortranFloat128Math/atan2.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/atan2.cpp rename to flang-rt/lib/FortranFloat128Math/atan2.cpp index 3c206b75704431..4994be699a0b67 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/atan2.cpp +++ b/flang-rt/lib/FortranFloat128Math/atan2.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/atan2.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/atan2.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/atanh.cpp b/flang-rt/lib/FortranFloat128Math/atanh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/atanh.cpp rename to flang-rt/lib/FortranFloat128Math/atanh.cpp index 77ceb188f04e42..f5ace35ac51caa 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/atanh.cpp +++ b/flang-rt/lib/FortranFloat128Math/atanh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/atanh.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/atanh.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/ceil.cpp b/flang-rt/lib/FortranFloat128Math/ceil.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/ceil.cpp rename to flang-rt/lib/FortranFloat128Math/ceil.cpp index 46bc253bd0922d..834da9396c071d 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/ceil.cpp +++ b/flang-rt/lib/FortranFloat128Math/ceil.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/ceil.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/ceil.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/complex-math.c b/flang-rt/lib/FortranFloat128Math/complex-math.c similarity index 96% rename from FortranRuntime/lib/Runtime/Float128Math/complex-math.c rename to flang-rt/lib/FortranFloat128Math/complex-math.c index f34ef7da76e599..493ffe942f7e31 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/complex-math.c +++ b/flang-rt/lib/FortranFloat128Math/complex-math.c @@ -1,4 +1,4 @@ -/*===-- lib/Runtime/Float128Math/complex-math.c ---------------------*- C -*-=== +/*===-- lib/FortranFloat128Math/complex-math.c ----------------------*- C -*-=== * * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. * See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/complex-math.h b/flang-rt/lib/FortranFloat128Math/complex-math.h similarity index 88% rename from FortranRuntime/lib/Runtime/Float128Math/complex-math.h rename to flang-rt/lib/FortranFloat128Math/complex-math.h index 6f5c7954bab035..bb67523e1bddcc 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/complex-math.h +++ b/flang-rt/lib/FortranFloat128Math/complex-math.h @@ -1,4 +1,4 @@ -/*===-- lib/Runtime/Float128Math/complex-math.h ---------------------*- C -*-=== +/*===-- lib/FortranFloat128Math/complex-math.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. @@ -6,8 +6,8 @@ * *===----------------------------------------------------------------------===*/ -#ifndef FORTRAN_RUNTIME_FLOAT128MATH_COMPLEX_MATH_H_ -#define FORTRAN_RUNTIME_FLOAT128MATH_COMPLEX_MATH_H_ +#ifndef FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_ +#define FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_ #include "flang/Common/float128.h" #include "flang/Runtime/entry-names.h" @@ -59,4 +59,4 @@ #error "Float128Math build with glibc>=2.26 is unsupported yet" #endif -#endif /* FORTRAN_RUNTIME_FLOAT128MATH_COMPLEX_MATH_H_ */ +#endif /* FORTRAN_FORTRANFLOAT128MATH_COMPLEX_MATH_H_ */ diff --git a/FortranRuntime/lib/Runtime/Float128Math/cos.cpp b/flang-rt/lib/FortranFloat128Math/cos.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/cos.cpp rename to flang-rt/lib/FortranFloat128Math/cos.cpp index 8ce47151e2914b..2651982666118b 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/cos.cpp +++ b/flang-rt/lib/FortranFloat128Math/cos.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/cos.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/cos.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/cosh.cpp b/flang-rt/lib/FortranFloat128Math/cosh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/cosh.cpp rename to flang-rt/lib/FortranFloat128Math/cosh.cpp index f1ec45bcfb479d..dda01e5abef66d 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/cosh.cpp +++ b/flang-rt/lib/FortranFloat128Math/cosh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/cosh.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/cosh.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/erf.cpp b/flang-rt/lib/FortranFloat128Math/erf.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/erf.cpp rename to flang-rt/lib/FortranFloat128Math/erf.cpp index 010088467794d1..f5e713d93cac61 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/erf.cpp +++ b/flang-rt/lib/FortranFloat128Math/erf.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/erf.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/erf.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/erfc.cpp b/flang-rt/lib/FortranFloat128Math/erfc.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/erfc.cpp rename to flang-rt/lib/FortranFloat128Math/erfc.cpp index b226f8d2dc378b..3f8b78ba0e64f9 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/erfc.cpp +++ b/flang-rt/lib/FortranFloat128Math/erfc.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/erfc.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/erfc.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/exp.cpp b/flang-rt/lib/FortranFloat128Math/exp.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/exp.cpp rename to flang-rt/lib/FortranFloat128Math/exp.cpp index e22f9df3579e96..0b694b159f3621 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/exp.cpp +++ b/flang-rt/lib/FortranFloat128Math/exp.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/exp.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/exp.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/exponent.cpp b/flang-rt/lib/FortranFloat128Math/exponent.cpp similarity index 92% rename from FortranRuntime/lib/Runtime/Float128Math/exponent.cpp rename to flang-rt/lib/FortranFloat128Math/exponent.cpp index f07bf30bd1096f..a9c1b867e7ea37 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/exponent.cpp +++ b/flang-rt/lib/FortranFloat128Math/exponent.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/exponent.cpp -------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/exponent.cpp --------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/floor.cpp b/flang-rt/lib/FortranFloat128Math/floor.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/floor.cpp rename to flang-rt/lib/FortranFloat128Math/floor.cpp index 8744e6e2fec63c..27cfed2f1f9599 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/floor.cpp +++ b/flang-rt/lib/FortranFloat128Math/floor.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/floor.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/floor.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/fma.cpp b/flang-rt/lib/FortranFloat128Math/fma.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/fma.cpp rename to flang-rt/lib/FortranFloat128Math/fma.cpp index 198fec5d4bc356..a9ac1581002cec 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/fma.cpp +++ b/flang-rt/lib/FortranFloat128Math/fma.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/fma.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/fma.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/fraction.cpp b/flang-rt/lib/FortranFloat128Math/fraction.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/fraction.cpp rename to flang-rt/lib/FortranFloat128Math/fraction.cpp index d4749bf3eb7e0e..39c59a25812abb 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/fraction.cpp +++ b/flang-rt/lib/FortranFloat128Math/fraction.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/fraction.cpp -------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/fraction.cpp --------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/hypot.cpp b/flang-rt/lib/FortranFloat128Math/hypot.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/hypot.cpp rename to flang-rt/lib/FortranFloat128Math/hypot.cpp index 6542bf505060df..c130e204f9951e 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/hypot.cpp +++ b/flang-rt/lib/FortranFloat128Math/hypot.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/hypot.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/hypot.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/j0.cpp b/flang-rt/lib/FortranFloat128Math/j0.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/j0.cpp rename to flang-rt/lib/FortranFloat128Math/j0.cpp index 27e4338cdfc2b0..d6454b56c8a86b 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/j0.cpp +++ b/flang-rt/lib/FortranFloat128Math/j0.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/j0.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/j0.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/j1.cpp b/flang-rt/lib/FortranFloat128Math/j1.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/j1.cpp rename to flang-rt/lib/FortranFloat128Math/j1.cpp index d3f897827f9f67..2b7283aea0fe46 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/j1.cpp +++ b/flang-rt/lib/FortranFloat128Math/j1.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/j1.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/j1.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/jn.cpp b/flang-rt/lib/FortranFloat128Math/jn.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/jn.cpp rename to flang-rt/lib/FortranFloat128Math/jn.cpp index 681bb5b1ff3ad5..cdc9af9b3dd6a5 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/jn.cpp +++ b/flang-rt/lib/FortranFloat128Math/jn.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/jn.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/jn.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/lgamma.cpp b/flang-rt/lib/FortranFloat128Math/lgamma.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/lgamma.cpp rename to flang-rt/lib/FortranFloat128Math/lgamma.cpp index 0426db2e3b98d3..cecf9e90ad29ba 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/lgamma.cpp +++ b/flang-rt/lib/FortranFloat128Math/lgamma.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/lgamma.cpp ---------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/lgamma.cpp ----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/llround.cpp b/flang-rt/lib/FortranFloat128Math/llround.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/llround.cpp rename to flang-rt/lib/FortranFloat128Math/llround.cpp index 4c9026cce00283..7853ac10f53e88 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/llround.cpp +++ b/flang-rt/lib/FortranFloat128Math/llround.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/llround.cpp --------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/llround.cpp ---------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/log.cpp b/flang-rt/lib/FortranFloat128Math/log.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/log.cpp rename to flang-rt/lib/FortranFloat128Math/log.cpp index a5a431ae5ffbbb..d705eaf441c31f 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/log.cpp +++ b/flang-rt/lib/FortranFloat128Math/log.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/log.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/log.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/log10.cpp b/flang-rt/lib/FortranFloat128Math/log10.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/log10.cpp rename to flang-rt/lib/FortranFloat128Math/log10.cpp index 9a83f57b6c736d..af61f8762371b9 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/log10.cpp +++ b/flang-rt/lib/FortranFloat128Math/log10.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/log10.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/log10.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/lround.cpp b/flang-rt/lib/FortranFloat128Math/lround.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/lround.cpp rename to flang-rt/lib/FortranFloat128Math/lround.cpp index 65546881157948..24278f1040e9e3 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/lround.cpp +++ b/flang-rt/lib/FortranFloat128Math/lround.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/lround.cpp ---------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/lround.cpp ----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/math-entries.h b/flang-rt/lib/FortranFloat128Math/math-entries.h similarity index 97% rename from FortranRuntime/lib/Runtime/Float128Math/math-entries.h rename to flang-rt/lib/FortranFloat128Math/math-entries.h index 1449000820f00e..9b13c10836f877 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/math-entries.h +++ b/flang-rt/lib/FortranFloat128Math/math-entries.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/math-entries.h -----------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/math-entries.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_FLOAT128MATH_MATH_ENTRIES_H_ -#define FORTRAN_RUNTIME_FLOAT128MATH_MATH_ENTRIES_H_ +#ifndef FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_ +#define FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_ #include "terminator.h" #include "tools.h" #include "flang/Common/float128.h" @@ -222,4 +222,4 @@ DEFINE_SIMPLE_ALIAS(Yn, ynl) } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_FLOAT128MATH_MATH_ENTRIES_H_ */ +#endif /* FORTRAN_FORTRANFLOAT128MATH_MATH_ENTRIES_H_ */ diff --git a/FortranRuntime/lib/Runtime/Float128Math/mod-real.cpp b/flang-rt/lib/FortranFloat128Math/mod-real.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/mod-real.cpp rename to flang-rt/lib/FortranFloat128Math/mod-real.cpp index e3b96d39e76ae6..b3c2b715b21995 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/mod-real.cpp +++ b/flang-rt/lib/FortranFloat128Math/mod-real.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/mod-real.cpp -------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/mod-real.cpp --------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/modulo-real.cpp b/flang-rt/lib/FortranFloat128Math/modulo-real.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/modulo-real.cpp rename to flang-rt/lib/FortranFloat128Math/modulo-real.cpp index 8edf59e9f59dd4..f5e3cf8a259a73 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/modulo-real.cpp +++ b/flang-rt/lib/FortranFloat128Math/modulo-real.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/modulo-real.cpp ----------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/modulo-real.cpp -----------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/nearest.cpp b/flang-rt/lib/FortranFloat128Math/nearest.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/nearest.cpp rename to flang-rt/lib/FortranFloat128Math/nearest.cpp index 8b9f142d79ff93..eb34c2ddb6ab48 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/nearest.cpp +++ b/flang-rt/lib/FortranFloat128Math/nearest.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/nearest.cpp --------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/nearest.cpp ---------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/norm2.cpp b/flang-rt/lib/FortranFloat128Math/norm2.cpp similarity index 94% rename from FortranRuntime/lib/Runtime/Float128Math/norm2.cpp rename to flang-rt/lib/FortranFloat128Math/norm2.cpp index a0c26e40de0064..d000fde1bb0bea 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/norm2.cpp +++ b/flang-rt/lib/FortranFloat128Math/norm2.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/norm2.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/norm2.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/numeric-template-specs.h b/flang-rt/lib/FortranFloat128Math/numeric-template-specs.h similarity index 84% rename from FortranRuntime/lib/Runtime/Float128Math/numeric-template-specs.h rename to flang-rt/lib/FortranFloat128Math/numeric-template-specs.h index 2a843df2d1d861..f34ee5f4e3a8de 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/numeric-template-specs.h +++ b/flang-rt/lib/FortranFloat128Math/numeric-template-specs.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/numeric-template-specs.h -------*- C++ -*-===// +//===-- lib/FortranFloat128Math/numeric-template-specs.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_FLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ -#define FORTRAN_RUNTIME_FLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ +#ifndef FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ +#define FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ #include "math-entries.h" #include "numeric-templates.h" @@ -52,4 +52,4 @@ template <> struct SQRTTy { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_FLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ */ +#endif /* FORTRAN_FORTRANFLOAT128MATH_NUMERIC_TEMPLATE_SPECS_H_ */ diff --git a/FortranRuntime/lib/Runtime/Float128Math/pow.cpp b/flang-rt/lib/FortranFloat128Math/pow.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/pow.cpp rename to flang-rt/lib/FortranFloat128Math/pow.cpp index c11978ca068f23..f5deb00a556f48 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/pow.cpp +++ b/flang-rt/lib/FortranFloat128Math/pow.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/pow.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/pow.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/random.cpp b/flang-rt/lib/FortranFloat128Math/random.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/random.cpp rename to flang-rt/lib/FortranFloat128Math/random.cpp index a9dc3c7a82b673..3a01c2c88b1d66 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/random.cpp +++ b/flang-rt/lib/FortranFloat128Math/random.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/random.cpp ---------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/random.cpp ----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/round.cpp b/flang-rt/lib/FortranFloat128Math/round.cpp similarity index 92% rename from FortranRuntime/lib/Runtime/Float128Math/round.cpp rename to flang-rt/lib/FortranFloat128Math/round.cpp index 5a9366b3af4785..3453f4ea8a1a26 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/round.cpp +++ b/flang-rt/lib/FortranFloat128Math/round.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/round.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/round.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/rrspacing.cpp b/flang-rt/lib/FortranFloat128Math/rrspacing.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/rrspacing.cpp rename to flang-rt/lib/FortranFloat128Math/rrspacing.cpp index 2c501b3512c215..0809815027f859 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/rrspacing.cpp +++ b/flang-rt/lib/FortranFloat128Math/rrspacing.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/rrspacing.cpp ------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/rrspacing.cpp -------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/scale.cpp b/flang-rt/lib/FortranFloat128Math/scale.cpp similarity index 92% rename from FortranRuntime/lib/Runtime/Float128Math/scale.cpp rename to flang-rt/lib/FortranFloat128Math/scale.cpp index 859c955b8114e0..37528330bfb115 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/scale.cpp +++ b/flang-rt/lib/FortranFloat128Math/scale.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/scale.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/scale.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/set-exponent.cpp b/flang-rt/lib/FortranFloat128Math/set-exponent.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/set-exponent.cpp rename to flang-rt/lib/FortranFloat128Math/set-exponent.cpp index 52258182871a14..52f8f08f7003ef 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/set-exponent.cpp +++ b/flang-rt/lib/FortranFloat128Math/set-exponent.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/set-exponent.cpp ---------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/set-exponent.cpp ----------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/sin.cpp b/flang-rt/lib/FortranFloat128Math/sin.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/sin.cpp rename to flang-rt/lib/FortranFloat128Math/sin.cpp index 99aa4095c8cf1a..1a24e7c57ba469 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/sin.cpp +++ b/flang-rt/lib/FortranFloat128Math/sin.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/sin.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/sin.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/sinh.cpp b/flang-rt/lib/FortranFloat128Math/sinh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/sinh.cpp rename to flang-rt/lib/FortranFloat128Math/sinh.cpp index a7dfe36737de43..7a4127cee970cd 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/sinh.cpp +++ b/flang-rt/lib/FortranFloat128Math/sinh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/sinh.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/sinh.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/spacing.cpp b/flang-rt/lib/FortranFloat128Math/spacing.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/spacing.cpp rename to flang-rt/lib/FortranFloat128Math/spacing.cpp index 66a01851965840..d3ed077d5412dc 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/spacing.cpp +++ b/flang-rt/lib/FortranFloat128Math/spacing.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/spacing.cpp --------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/spacing.cpp ---------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/sqrt.cpp b/flang-rt/lib/FortranFloat128Math/sqrt.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/sqrt.cpp rename to flang-rt/lib/FortranFloat128Math/sqrt.cpp index cbc1e503d50fd9..a9f5246f35388f 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/sqrt.cpp +++ b/flang-rt/lib/FortranFloat128Math/sqrt.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/sqrt.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/sqrt.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/tan.cpp b/flang-rt/lib/FortranFloat128Math/tan.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/tan.cpp rename to flang-rt/lib/FortranFloat128Math/tan.cpp index dbe4627f585f14..dc386c5be6ab74 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/tan.cpp +++ b/flang-rt/lib/FortranFloat128Math/tan.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/tan.cpp ------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/tan.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/tanh.cpp b/flang-rt/lib/FortranFloat128Math/tanh.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/tanh.cpp rename to flang-rt/lib/FortranFloat128Math/tanh.cpp index 37e40966ced722..5f8af3f1cd8d77 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/tanh.cpp +++ b/flang-rt/lib/FortranFloat128Math/tanh.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/tanh.cpp -----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/tanh.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/tgamma.cpp b/flang-rt/lib/FortranFloat128Math/tgamma.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/tgamma.cpp rename to flang-rt/lib/FortranFloat128Math/tgamma.cpp index 07a019c6d9971f..b1a42cdc5d0f41 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/tgamma.cpp +++ b/flang-rt/lib/FortranFloat128Math/tgamma.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/tgamma.cpp ---------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/tgamma.cpp ----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/trunc.cpp b/flang-rt/lib/FortranFloat128Math/trunc.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/Float128Math/trunc.cpp rename to flang-rt/lib/FortranFloat128Math/trunc.cpp index 9f38bdc18e73c4..455204ece3b2f6 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/trunc.cpp +++ b/flang-rt/lib/FortranFloat128Math/trunc.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/trunc.cpp ----------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/trunc.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/y0.cpp b/flang-rt/lib/FortranFloat128Math/y0.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/y0.cpp rename to flang-rt/lib/FortranFloat128Math/y0.cpp index 6eaa3396e7ea07..58bd71105efea6 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/y0.cpp +++ b/flang-rt/lib/FortranFloat128Math/y0.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/y0.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/y0.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/y1.cpp b/flang-rt/lib/FortranFloat128Math/y1.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/y1.cpp rename to flang-rt/lib/FortranFloat128Math/y1.cpp index c9f48ea0e26546..5d7b48e276b6f9 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/y1.cpp +++ b/flang-rt/lib/FortranFloat128Math/y1.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/y1.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/y1.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/Float128Math/yn.cpp b/flang-rt/lib/FortranFloat128Math/yn.cpp similarity index 90% rename from FortranRuntime/lib/Runtime/Float128Math/yn.cpp rename to flang-rt/lib/FortranFloat128Math/yn.cpp index 6bc5f4996a88d5..9f19861931d84c 100644 --- a/FortranRuntime/lib/Runtime/Float128Math/yn.cpp +++ b/flang-rt/lib/FortranFloat128Math/yn.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/Float128Math/yn.cpp -------------------------*- C++ -*-===// +//===-- lib/FortranFloat128Math/yn.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/CMakeLists.txt b/flang-rt/lib/flang_rt/CMakeLists.txt similarity index 98% rename from FortranRuntime/lib/Runtime/CMakeLists.txt rename to flang-rt/lib/flang_rt/CMakeLists.txt index b7f32fe30e422a..dc6fc6323d49a6 100644 --- a/FortranRuntime/lib/Runtime/CMakeLists.txt +++ b/flang-rt/lib/flang_rt/CMakeLists.txt @@ -1,4 +1,4 @@ -#===-- lib/Runtime/CMakeLists.txt ------------------------------------------===# +#===-- lib/flang_rt/CMakeLists.txt -----------------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. @@ -105,7 +105,7 @@ append(${NO_LTO_FLAGS} CMAKE_CXX_FLAGS) add_definitions(-U_GLIBCXX_ASSERTIONS) add_definitions(-U_LIBCPP_ENABLE_ASSERTIONS) -add_subdirectory(Float128Math) +add_subdirectory(../FortranFloat128Math Float128Math) set(sources ISO_Fortran_binding.cpp @@ -312,5 +312,5 @@ if (TARGET flang-new AND TARGET module_files) endif() if (FLANG_CUF_RUNTIME) - add_subdirectory(CUDA) + add_subdirectory(../CufRuntime CUDA) endif() diff --git a/FortranRuntime/lib/Runtime/ISO_Fortran_binding.cpp b/flang-rt/lib/flang_rt/ISO_Fortran_binding.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/ISO_Fortran_binding.cpp rename to flang-rt/lib/flang_rt/ISO_Fortran_binding.cpp index 997226b08e96a6..37bc1b9dfe426b 100644 --- a/FortranRuntime/lib/Runtime/ISO_Fortran_binding.cpp +++ b/flang-rt/lib/flang_rt/ISO_Fortran_binding.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/ISO_Fortran_binding.cpp ---------------------*- C++ -*-===// +//===-- lib/flang_rt/ISO_Fortran_binding.cpp --------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,9 +9,9 @@ // Implements the required interoperability API from ISO_Fortran_binding.h // as specified in section 18.5.5 of Fortran 2018. -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" #include "ISO_Fortran_util.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "terminator.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "flang/Runtime/pointer.h" diff --git a/FortranRuntime/lib/Runtime/ISO_Fortran_util.h b/flang-rt/lib/flang_rt/ISO_Fortran_util.h similarity index 91% rename from FortranRuntime/lib/Runtime/ISO_Fortran_util.h rename to flang-rt/lib/flang_rt/ISO_Fortran_util.h index e418266dddccc7..a7bb1d21679063 100644 --- a/FortranRuntime/lib/Runtime/ISO_Fortran_util.h +++ b/flang-rt/lib/flang_rt/ISO_Fortran_util.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/ISO_Fortran_util.h --------------------------*- C++ -*-===// +//===-- lib/flang_rt/ISO_Fortran_util.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. @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_ISO_FORTRAN_UTIL_H_ -#define FORTRAN_RUNTIME_ISO_FORTRAN_UTIL_H_ +#ifndef FORTRAN_FLANG_RT_ISO_FORTRAN_UTIL_H_ +#define FORTRAN_FLANG_RT_ISO_FORTRAN_UTIL_H_ // Internal utils for establishing CFI_cdesc_t descriptors. -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "terminator.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include @@ -99,4 +99,4 @@ static inline RT_API_ATTRS void EstablishDescriptor(CFI_cdesc_t *descriptor, } } } // namespace Fortran::ISO -#endif /* FORTRAN_RUNTIME_ISO_FORTRAN_UTIL_H_ */ +#endif /* FORTRAN_FLANG_RT_ISO_FORTRAN_UTIL_H_ */ diff --git a/FortranRuntime/lib/Runtime/allocatable.cpp b/flang-rt/lib/flang_rt/allocatable.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/allocatable.cpp rename to flang-rt/lib/flang_rt/allocatable.cpp index 4a3b89f4879c12..b9be74f8cb6f1b 100644 --- a/FortranRuntime/lib/Runtime/allocatable.cpp +++ b/flang-rt/lib/flang_rt/allocatable.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/allocatable.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/allocatable.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/allocatable.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "assign-impl.h" #include "derived.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stat.h" #include "terminator.h" #include "type-info.h" diff --git a/FortranRuntime/lib/Runtime/allocator-registry.cpp b/flang-rt/lib/flang_rt/allocator-registry.cpp similarity index 91% rename from FortranRuntime/lib/Runtime/allocator-registry.cpp rename to flang-rt/lib/flang_rt/allocator-registry.cpp index 17883e5c54870d..538feceec13db6 100644 --- a/FortranRuntime/lib/Runtime/allocator-registry.cpp +++ b/flang-rt/lib/flang_rt/allocator-registry.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/allocator-registry.cpp ----------------------*- C++ -*-===// +//===-- lib/flang_rt/allocator-registry.cpp ---------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/allocator-registry.h" +#include "flang-rt/flang_rt/allocator-registry.h" #include "terminator.h" namespace Fortran::runtime { diff --git a/FortranRuntime/lib/Runtime/array-constructor.cpp b/flang-rt/lib/flang_rt/array-constructor.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/array-constructor.cpp rename to flang-rt/lib/flang_rt/array-constructor.cpp index 002dfba2c066f5..daaa1e3b04a3b6 100644 --- a/FortranRuntime/lib/Runtime/array-constructor.cpp +++ b/flang-rt/lib/flang_rt/array-constructor.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/array-constructor.cpp -----------------------*- C++ -*-===// +//===-- lib/flang_rt/array-constructor.cpp ----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/array-constructor.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/array-constructor.h" #include "derived.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "type-info.h" diff --git a/FortranRuntime/lib/Runtime/assign-impl.h b/flang-rt/lib/flang_rt/assign-impl.h similarity index 100% rename from FortranRuntime/lib/Runtime/assign-impl.h rename to flang-rt/lib/flang_rt/assign-impl.h diff --git a/FortranRuntime/lib/Runtime/assign.cpp b/flang-rt/lib/flang_rt/assign.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/assign.cpp rename to flang-rt/lib/flang_rt/assign.cpp index 3a1486ace928a2..4916fc48888189 100644 --- a/FortranRuntime/lib/Runtime/assign.cpp +++ b/flang-rt/lib/flang_rt/assign.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/assign.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/assign.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/assign.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "assign-impl.h" #include "derived.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stat.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/buffer.cpp b/flang-rt/lib/flang_rt/buffer.cpp similarity index 93% rename from FortranRuntime/lib/Runtime/buffer.cpp rename to flang-rt/lib/flang_rt/buffer.cpp index ce78fe34503c46..9913cdf2e7ec40 100644 --- a/FortranRuntime/lib/Runtime/buffer.cpp +++ b/flang-rt/lib/flang_rt/buffer.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/buffer.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/buffer.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/buffer.h b/flang-rt/lib/flang_rt/buffer.h similarity index 97% rename from FortranRuntime/lib/Runtime/buffer.h rename to flang-rt/lib/flang_rt/buffer.h index 52df0f10813c25..eb9b0712819a6c 100644 --- a/FortranRuntime/lib/Runtime/buffer.h +++ b/flang-rt/lib/flang_rt/buffer.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/buffer.h ------------------------------------*- C++ -*-===// +//===-- lib/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. @@ -8,10 +8,10 @@ // External file buffering -#ifndef FORTRAN_RUNTIME_BUFFER_H_ -#define FORTRAN_RUNTIME_BUFFER_H_ +#ifndef FORTRAN_FLANG_RT_BUFFER_H_ +#define FORTRAN_FLANG_RT_BUFFER_H_ -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "io-error.h" #include "flang/Runtime/freestanding-tools.h" #include @@ -221,4 +221,4 @@ template class FileFrame { bool dirty_{false}; }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_BUFFER_H_ */ +#endif /* FORTRAN_FLANG_RT_BUFFER_H_ */ diff --git a/FortranRuntime/lib/Runtime/character.cpp b/flang-rt/lib/flang_rt/character.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/character.cpp rename to flang-rt/lib/flang_rt/character.cpp index 1f3edd6e80392e..aeb26098c399c8 100644 --- a/FortranRuntime/lib/Runtime/character.cpp +++ b/flang-rt/lib/flang_rt/character.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/character.cpp -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/character.cpp ------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/character.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Common/bit-population-count.h" diff --git a/FortranRuntime/lib/Runtime/command.cpp b/flang-rt/lib/flang_rt/command.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/command.cpp rename to flang-rt/lib/flang_rt/command.cpp index 64b2e62461dd58..5c7497518f3da3 100644 --- a/FortranRuntime/lib/Runtime/command.cpp +++ b/flang-rt/lib/flang_rt/command.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/command.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/command.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/command.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "environment.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stat.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/complex-powi.cpp b/flang-rt/lib/flang_rt/complex-powi.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/complex-powi.cpp rename to flang-rt/lib/flang_rt/complex-powi.cpp index 2eacf56386b193..90013c117aea41 100644 --- a/FortranRuntime/lib/Runtime/complex-powi.cpp +++ b/flang-rt/lib/flang_rt/complex-powi.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/complex-powi.cpp ----------------------------*- C++ -*-===// +//===-- lib/flang_rt/complex-powi.cpp ---------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/complex-reduction.c b/flang-rt/lib/flang_rt/complex-reduction.c similarity index 98% rename from FortranRuntime/lib/Runtime/complex-reduction.c rename to flang-rt/lib/flang_rt/complex-reduction.c index 138174e9122b1c..23f1edb58b2d4e 100644 --- a/FortranRuntime/lib/Runtime/complex-reduction.c +++ b/flang-rt/lib/flang_rt/complex-reduction.c @@ -1,4 +1,4 @@ -/*===-- lib/Runtime/complex-reduction.c -----------------------------*- C -*-=== +/*===-- lib/flang_rt/complex-reduction.c ----------------------------*- C -*-=== * * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. * See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/complex-reduction.h b/flang-rt/lib/flang_rt/complex-reduction.h similarity index 97% rename from FortranRuntime/lib/Runtime/complex-reduction.h rename to flang-rt/lib/flang_rt/complex-reduction.h index e8e287215b7d97..b386b25cd0fff8 100644 --- a/FortranRuntime/lib/Runtime/complex-reduction.h +++ b/flang-rt/lib/flang_rt/complex-reduction.h @@ -1,4 +1,4 @@ -/*===-- lib/Runtime/complex-reduction.h -----------------------------*- C -*-=== +/*===-- lib/flang_rt/complex-reduction.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. @@ -11,8 +11,8 @@ * with C++ build compilers that don't support C's _Complex. */ -#ifndef FORTRAN_RUNTIME_COMPLEX_REDUCTION_H_ -#define FORTRAN_RUNTIME_COMPLEX_REDUCTION_H_ +#ifndef FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_ +#define FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_ #include "flang/Common/float128.h" #include "flang/Runtime/entry-names.h" @@ -155,4 +155,4 @@ void RTNAME(ReduceComplex16DimValue)( REDUCE_DIM_ARGS(CFloat128ComplexType, CFloat128ComplexType_value_op)); #endif -#endif /* FORTRAN_RUNTIME_COMPLEX_REDUCTION_H_ */ +#endif /* FORTRAN_FLANG_RT_COMPLEX_REDUCTION_H_ */ diff --git a/FortranRuntime/lib/Runtime/connection.cpp b/flang-rt/lib/flang_rt/connection.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/connection.cpp rename to flang-rt/lib/flang_rt/connection.cpp index f9e91f1f193ba0..d623190f22f6f9 100644 --- a/FortranRuntime/lib/Runtime/connection.cpp +++ b/flang-rt/lib/flang_rt/connection.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/connection.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/connection.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/connection.h b/flang-rt/lib/flang_rt/connection.h similarity index 96% rename from FortranRuntime/lib/Runtime/connection.h rename to flang-rt/lib/flang_rt/connection.h index e078bfb9f0f7e7..f8b9b3f9debcda 100644 --- a/FortranRuntime/lib/Runtime/connection.h +++ b/flang-rt/lib/flang_rt/connection.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/connection.h --------------------------------*- C++ -*-===// +//===-- lib/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. @@ -8,8 +8,8 @@ // Fortran I/O connection state (abstracted over internal & external units) -#ifndef FORTRAN_RUNTIME_CONNECTION_H_ -#define FORTRAN_RUNTIME_CONNECTION_H_ +#ifndef FORTRAN_FLANG_RT_CONNECTION_H_ +#define FORTRAN_FLANG_RT_CONNECTION_H_ #include "format.h" #include "flang/Common/optional.h" @@ -124,4 +124,4 @@ class SavedPosition { }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_CONNECTION_H_ */ +#endif /* FORTRAN_FLANG_RT_CONNECTION_H_ */ diff --git a/FortranRuntime/lib/Runtime/copy.cpp b/flang-rt/lib/flang_rt/copy.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/copy.cpp rename to flang-rt/lib/flang_rt/copy.cpp index 1049b925f68e5c..fc5c0af6b95851 100644 --- a/FortranRuntime/lib/Runtime/copy.cpp +++ b/flang-rt/lib/flang_rt/copy.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/copy.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/copy.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "copy.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stack.h" #include "terminator.h" #include "type-info.h" diff --git a/FortranRuntime/lib/Runtime/copy.h b/flang-rt/lib/flang_rt/copy.h similarity index 78% rename from FortranRuntime/lib/Runtime/copy.h rename to flang-rt/lib/flang_rt/copy.h index 3d179d0bec91a7..8f27c3a90b7847 100644 --- a/FortranRuntime/lib/Runtime/copy.h +++ b/flang-rt/lib/flang_rt/copy.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/copy.h --------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/copy.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. @@ -9,10 +9,10 @@ // Utilities that copy data in a type-aware fashion, allocating & duplicating // allocatable/automatic components of derived types along the way. -#ifndef FORTRAN_RUNTIME_COPY_H_ -#define FORTRAN_RUNTIME_COPY_H_ +#ifndef FORTRAN_FLANG_RT_COPY_H_ +#define FORTRAN_FLANG_RT_COPY_H_ -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" namespace Fortran::runtime { @@ -22,4 +22,4 @@ RT_API_ATTRS void CopyElement(const Descriptor &to, const SubscriptValue toAt[], const Descriptor &from, const SubscriptValue fromAt[], Terminator &); } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_COPY_H_ */ +#endif /* FORTRAN_FLANG_RT_COPY_H_ */ diff --git a/FortranRuntime/lib/Runtime/derived-api.cpp b/flang-rt/lib/flang_rt/derived-api.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/derived-api.cpp rename to flang-rt/lib/flang_rt/derived-api.cpp index 176fc0849f25cf..faf24508981bae 100644 --- a/FortranRuntime/lib/Runtime/derived-api.cpp +++ b/flang-rt/lib/flang_rt/derived-api.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/derived-api.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/derived-api.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/derived-api.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "derived.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "type-info.h" diff --git a/FortranRuntime/lib/Runtime/derived.cpp b/flang-rt/lib/flang_rt/derived.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/derived.cpp rename to flang-rt/lib/flang_rt/derived.cpp index cb2dca24bb4758..9b17a0d437375c 100644 --- a/FortranRuntime/lib/Runtime/derived.cpp +++ b/flang-rt/lib/flang_rt/derived.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/derived.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/derived.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "derived.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stat.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/derived.h b/flang-rt/lib/flang_rt/derived.h similarity index 88% rename from FortranRuntime/lib/Runtime/derived.h rename to flang-rt/lib/flang_rt/derived.h index e03e657f01cee9..3d6563f39c0663 100644 --- a/FortranRuntime/lib/Runtime/derived.h +++ b/flang-rt/lib/flang_rt/derived.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/derived.h -----------------------------------*- C++ -*-===// +//===-- lib/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. @@ -8,8 +8,8 @@ // Internal runtime utilities for derived type operations. -#ifndef FORTRAN_RUNTIME_DERIVED_H_ -#define FORTRAN_RUNTIME_DERIVED_H_ +#ifndef FORTRAN_FLANG_RT_DERIVED_H_ +#define FORTRAN_FLANG_RT_DERIVED_H_ #include "flang/Common/api-attrs.h" @@ -40,4 +40,4 @@ RT_API_ATTRS void Destroy(const Descriptor &, bool finalize, RT_API_ATTRS bool HasDynamicComponent(const Descriptor &); } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_DERIVED_H_ */ +#endif /* FORTRAN_FLANG_RT_DERIVED_H_ */ diff --git a/FortranRuntime/lib/Runtime/descriptor-io.cpp b/flang-rt/lib/flang_rt/descriptor-io.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/descriptor-io.cpp rename to flang-rt/lib/flang_rt/descriptor-io.cpp index 896fad16a67e8a..c5cfa4d7fc5972 100644 --- a/FortranRuntime/lib/Runtime/descriptor-io.cpp +++ b/flang-rt/lib/flang_rt/descriptor-io.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/descriptor-io.cpp ---------------------------*- C++ -*-===// +//===-- lib/flang_rt/descriptor-io.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/descriptor-io.h b/flang-rt/lib/flang_rt/descriptor-io.h similarity index 98% rename from FortranRuntime/lib/Runtime/descriptor-io.h rename to flang-rt/lib/flang_rt/descriptor-io.h index 30d1bd48457728..2e48b4a0353e2a 100644 --- a/FortranRuntime/lib/Runtime/descriptor-io.h +++ b/flang-rt/lib/flang_rt/descriptor-io.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/descriptor-io.h -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/descriptor-io.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. @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_DESCRIPTOR_IO_H_ -#define FORTRAN_RUNTIME_DESCRIPTOR_IO_H_ +#ifndef FORTRAN_FLANG_RT_DESCRIPTOR_IO_H_ +#define FORTRAN_FLANG_RT_DESCRIPTOR_IO_H_ // Implementation of I/O data list item transfers based on descriptors. // (All I/O items come through here so that the code is exercised for test; // some scalar I/O data transfer APIs could be changed to bypass their use // of descriptors in the future for better efficiency.) -#include "FortranRuntime/Runtime/descriptor.h" #include "edit-input.h" #include "edit-output.h" +#include "flang-rt/flang_rt/descriptor.h" #include "io-stmt.h" #include "namelist.h" #include "terminator.h" @@ -608,4 +608,4 @@ static RT_API_ATTRS bool DescriptorIO(IoStatementState &io, return false; } } // namespace Fortran::runtime::io::descr -#endif /* FORTRAN_RUNTIME_DESCRIPTOR_IO_H_ */ +#endif /* FORTRAN_FLANG_RT_DESCRIPTOR_IO_H_ */ diff --git a/FortranRuntime/lib/Runtime/descriptor.cpp b/flang-rt/lib/flang_rt/descriptor.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/descriptor.cpp rename to flang-rt/lib/flang_rt/descriptor.cpp index 96fd48eb6687a9..77536e760ad1cd 100644 --- a/FortranRuntime/lib/Runtime/descriptor.cpp +++ b/flang-rt/lib/flang_rt/descriptor.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/descriptor.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/descriptor.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/allocator-registry.h" +#include "flang-rt/flang_rt/descriptor.h" #include "ISO_Fortran_util.h" #include "derived.h" +#include "flang-rt/flang_rt/allocator-registry.h" #include "memory.h" #include "stat.h" #include "terminator.h" diff --git a/FortranRuntime/lib/Runtime/dot-product.cpp b/flang-rt/lib/flang_rt/dot-product.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/dot-product.cpp rename to flang-rt/lib/flang_rt/dot-product.cpp index 2992cbb1f39ad6..01e15ad331d7c4 100644 --- a/FortranRuntime/lib/Runtime/dot-product.cpp +++ b/flang-rt/lib/flang_rt/dot-product.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/dot-product.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/dot-product.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "float.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/edit-input.cpp b/flang-rt/lib/flang_rt/edit-input.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/edit-input.cpp rename to flang-rt/lib/flang_rt/edit-input.cpp index 6ebb0e7aca4ade..9e3f102cf86684 100644 --- a/FortranRuntime/lib/Runtime/edit-input.cpp +++ b/flang-rt/lib/flang_rt/edit-input.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/edit-input.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/edit-input.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/edit-input.h b/flang-rt/lib/flang_rt/edit-input.h similarity index 90% rename from FortranRuntime/lib/Runtime/edit-input.h rename to flang-rt/lib/flang_rt/edit-input.h index f88f6daa47be79..59f601afa306a3 100644 --- a/FortranRuntime/lib/Runtime/edit-input.h +++ b/flang-rt/lib/flang_rt/edit-input.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/edit-input.h --------------------------------*- C++ -*-===// +//===-- lib/flang_rt/edit-input.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_EDIT_INPUT_H_ -#define FORTRAN_RUNTIME_EDIT_INPUT_H_ +#ifndef FORTRAN_FLANG_RT_EDIT_INPUT_H_ +#define FORTRAN_FLANG_RT_EDIT_INPUT_H_ #include "format.h" #include "io-stmt.h" @@ -50,4 +50,4 @@ extern template RT_API_ATTRS bool EditCharacterInput( IoStatementState &, const DataEdit &, char32_t *, std::size_t); } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_EDIT_INPUT_H_ */ +#endif /* FORTRAN_FLANG_RT_EDIT_INPUT_H_ */ diff --git a/FortranRuntime/lib/Runtime/edit-output.cpp b/flang-rt/lib/flang_rt/edit-output.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/edit-output.cpp rename to flang-rt/lib/flang_rt/edit-output.cpp index ccaf8085f016fd..2e353f1ad80a21 100644 --- a/FortranRuntime/lib/Runtime/edit-output.cpp +++ b/flang-rt/lib/flang_rt/edit-output.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/edit-output.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/edit-output.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/edit-output.h b/flang-rt/lib/flang_rt/edit-output.h similarity index 96% rename from FortranRuntime/lib/Runtime/edit-output.h rename to flang-rt/lib/flang_rt/edit-output.h index 7e6c6cdedde3ac..325658b4a25dc6 100644 --- a/FortranRuntime/lib/Runtime/edit-output.h +++ b/flang-rt/lib/flang_rt/edit-output.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/edit-output.h -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/edit-output.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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_EDIT_OUTPUT_H_ -#define FORTRAN_RUNTIME_EDIT_OUTPUT_H_ +#ifndef FORTRAN_FLANG_RT_EDIT_OUTPUT_H_ +#define FORTRAN_FLANG_RT_EDIT_OUTPUT_H_ // Output data editing templates implementing the FORMAT data editing // descriptors E, EN, ES, EX, D, F, and G for REAL data (and COMPLEX @@ -138,4 +138,4 @@ extern template class RealOutputEditing<10>; extern template class RealOutputEditing<16>; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_EDIT_OUTPUT_H_ */ +#endif /* FORTRAN_FLANG_RT_EDIT_OUTPUT_H_ */ diff --git a/FortranRuntime/lib/Runtime/emit-encoded.h b/flang-rt/lib/flang_rt/emit-encoded.h similarity index 94% rename from FortranRuntime/lib/Runtime/emit-encoded.h rename to flang-rt/lib/flang_rt/emit-encoded.h index 11163a41720795..87216e5808a286 100644 --- a/FortranRuntime/lib/Runtime/emit-encoded.h +++ b/flang-rt/lib/flang_rt/emit-encoded.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/emit-encoded.h ------------------------------*- C++ -*-===// +//===-- lib/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. @@ -8,8 +8,8 @@ // Templates for emitting CHARACTER values with conversion -#ifndef FORTRAN_RUNTIME_EMIT_ENCODED_H_ -#define FORTRAN_RUNTIME_EMIT_ENCODED_H_ +#ifndef FORTRAN_FLANG_RT_EMIT_ENCODED_H_ +#define FORTRAN_FLANG_RT_EMIT_ENCODED_H_ #include "connection.h" #include "environment.h" @@ -114,4 +114,4 @@ RT_API_ATTRS bool EmitRepeated(CONTEXT &to, char ch, std::size_t n) { } } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_EMIT_ENCODED_H_ */ +#endif /* FORTRAN_FLANG_RT_EMIT_ENCODED_H_ */ diff --git a/FortranRuntime/lib/Runtime/environment-default-list.h b/flang-rt/lib/flang_rt/environment-default-list.h similarity index 100% rename from FortranRuntime/lib/Runtime/environment-default-list.h rename to flang-rt/lib/flang_rt/environment-default-list.h diff --git a/FortranRuntime/lib/Runtime/environment.cpp b/flang-rt/lib/flang_rt/environment.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/environment.cpp rename to flang-rt/lib/flang_rt/environment.cpp index 272914877988a5..9ff65f1e60ddcd 100644 --- a/FortranRuntime/lib/Runtime/environment.cpp +++ b/flang-rt/lib/flang_rt/environment.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/environment.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/environment.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/environment.h b/flang-rt/lib/flang_rt/environment.h similarity index 91% rename from FortranRuntime/lib/Runtime/environment.h rename to flang-rt/lib/flang_rt/environment.h index 7d10b3a2b934bf..125c9b39528b94 100644 --- a/FortranRuntime/lib/Runtime/environment.h +++ b/flang-rt/lib/flang_rt/environment.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/environment.h -------------------------------*- C++ -*-===// +//===-- lib/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. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_ENVIRONMENT_H_ -#define FORTRAN_RUNTIME_ENVIRONMENT_H_ +#ifndef FORTRAN_FLANG_RT_ENVIRONMENT_H_ +#define FORTRAN_FLANG_RT_ENVIRONMENT_H_ #include "flang/Common/decimal.h" #include "flang/Common/optional.h" @@ -64,4 +64,4 @@ RT_OFFLOAD_VAR_GROUP_END } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_ENVIRONMENT_H_ */ +#endif /* FORTRAN_FLANG_RT_ENVIRONMENT_H_ */ diff --git a/FortranRuntime/lib/Runtime/exceptions.cpp b/flang-rt/lib/flang_rt/exceptions.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/exceptions.cpp rename to flang-rt/lib/flang_rt/exceptions.cpp index 7739130ae2346a..9ad5fe6849b076 100644 --- a/FortranRuntime/lib/Runtime/exceptions.cpp +++ b/flang-rt/lib/flang_rt/exceptions.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/exceptions.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/exceptions.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/execute.cpp b/flang-rt/lib/flang_rt/execute.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/execute.cpp rename to flang-rt/lib/flang_rt/execute.cpp index b333c61c8a59f4..d3d42a49737fed 100644 --- a/FortranRuntime/lib/Runtime/execute.cpp +++ b/flang-rt/lib/flang_rt/execute.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/execute.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/execute.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/execute.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "environment.h" +#include "flang-rt/flang_rt/descriptor.h" #include "stat.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/extensions.cpp b/flang-rt/lib/flang_rt/extensions.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/extensions.cpp rename to flang-rt/lib/flang_rt/extensions.cpp index bb25fe6ee9d886..4cd9791cd0e5cb 100644 --- a/FortranRuntime/lib/Runtime/extensions.cpp +++ b/flang-rt/lib/flang_rt/extensions.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/extensions.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/extensions.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,8 +10,8 @@ // extensions that will eventually be implemented in Fortran. #include "flang/Runtime/extensions.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "terminator.h" #include "tools.h" #include "flang/Runtime/command.h" diff --git a/FortranRuntime/lib/Runtime/external-unit.cpp b/flang-rt/lib/flang_rt/external-unit.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/external-unit.cpp rename to flang-rt/lib/flang_rt/external-unit.cpp index f5fa2c31dafc4e..1942cc1ff4daec 100644 --- a/FortranRuntime/lib/Runtime/external-unit.cpp +++ b/flang-rt/lib/flang_rt/external-unit.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/external-unit.cpp ---------------------------*- C++ -*-===// +//===-- lib/flang_rt/external-unit.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/extrema.cpp b/flang-rt/lib/flang_rt/extrema.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/extrema.cpp rename to flang-rt/lib/flang_rt/extrema.cpp index be9da63d7bd6b8..7a230afc4190c6 100644 --- a/FortranRuntime/lib/Runtime/extrema.cpp +++ b/flang-rt/lib/flang_rt/extrema.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/extrema.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/extrema.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/file.cpp b/flang-rt/lib/flang_rt/file.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/file.cpp rename to flang-rt/lib/flang_rt/file.cpp index de52dafd12df9a..d98c8afeca3514 100644 --- a/FortranRuntime/lib/Runtime/file.cpp +++ b/flang-rt/lib/flang_rt/file.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/file.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/file.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "file.h" -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "tools.h" #include "flang/Runtime/magic-numbers.h" #include diff --git a/FortranRuntime/lib/Runtime/file.h b/flang-rt/lib/flang_rt/file.h similarity index 94% rename from FortranRuntime/lib/Runtime/file.h rename to flang-rt/lib/flang_rt/file.h index 60ddf2a2741610..b4068e3dce0d14 100644 --- a/FortranRuntime/lib/Runtime/file.h +++ b/flang-rt/lib/flang_rt/file.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/file.h --------------------------------------*- C++ -*-===// +//===-- lib/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. @@ -8,10 +8,10 @@ // Raw system I/O wrappers -#ifndef FORTRAN_RUNTIME_FILE_H_ -#define FORTRAN_RUNTIME_FILE_H_ +#ifndef FORTRAN_FLANG_RT_FILE_H_ +#define FORTRAN_FLANG_RT_FILE_H_ -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "io-error.h" #include "flang/Common/optional.h" #include @@ -113,4 +113,4 @@ RT_API_ATTRS bool MayWrite(const char *path); RT_API_ATTRS bool MayReadAndWrite(const char *path); RT_API_ATTRS std::int64_t SizeInBytes(const char *path); } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_FILE_H_ */ +#endif /* FORTRAN_FLANG_RT_FILE_H_ */ diff --git a/FortranRuntime/lib/Runtime/findloc.cpp b/flang-rt/lib/flang_rt/findloc.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/findloc.cpp rename to flang-rt/lib/flang_rt/findloc.cpp index da5fe0c0a0a467..8ee4c7c6cf7800 100644 --- a/FortranRuntime/lib/Runtime/findloc.cpp +++ b/flang-rt/lib/flang_rt/findloc.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/findloc.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/findloc.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/format-implementation.h b/flang-rt/lib/flang_rt/format-implementation.h similarity index 98% rename from FortranRuntime/lib/Runtime/format-implementation.h rename to flang-rt/lib/flang_rt/format-implementation.h index f17f0a2cb4bfd9..9b7ad6f2ce1fc6 100644 --- a/FortranRuntime/lib/Runtime/format-implementation.h +++ b/flang-rt/lib/flang_rt/format-implementation.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/format-implementation.h ---------------------*- C++ -*-===// +//===-- lib/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. @@ -8,8 +8,8 @@ // Implements out-of-line member functions of template class FormatControl -#ifndef FORTRAN_RUNTIME_FORMAT_IMPLEMENTATION_H_ -#define FORTRAN_RUNTIME_FORMAT_IMPLEMENTATION_H_ +#ifndef FORTRAN_FLANG_RT_FORMAT_IMPLEMENTATION_H_ +#define FORTRAN_FLANG_RT_FORMAT_IMPLEMENTATION_H_ #include "emit-encoded.h" #include "format.h" @@ -601,4 +601,4 @@ RT_API_ATTRS void FormatControl::Finish(Context &context) { } } } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_FORMAT_IMPLEMENTATION_H_ */ +#endif /* FORTRAN_FLANG_RT_FORMAT_IMPLEMENTATION_H_ */ diff --git a/FortranRuntime/lib/Runtime/format.cpp b/flang-rt/lib/flang_rt/format.cpp similarity index 93% rename from FortranRuntime/lib/Runtime/format.cpp rename to flang-rt/lib/flang_rt/format.cpp index 73a61f785c23b8..aedf04b8a40a1b 100644 --- a/FortranRuntime/lib/Runtime/format.cpp +++ b/flang-rt/lib/flang_rt/format.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/format.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/format.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/format.h b/flang-rt/lib/flang_rt/format.h similarity index 97% rename from FortranRuntime/lib/Runtime/format.h rename to flang-rt/lib/flang_rt/format.h index 098a251a04d568..b41eec9564baaa 100644 --- a/FortranRuntime/lib/Runtime/format.h +++ b/flang-rt/lib/flang_rt/format.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/format.h ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/format.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. @@ -8,8 +8,8 @@ // FORMAT string processing -#ifndef FORTRAN_RUNTIME_FORMAT_H_ -#define FORTRAN_RUNTIME_FORMAT_H_ +#ifndef FORTRAN_FLANG_RT_FORMAT_H_ +#define FORTRAN_FLANG_RT_FORMAT_H_ #include "environment.h" #include "io-error.h" @@ -201,4 +201,4 @@ template class FormatControl { Iteration stack_[maxMaxHeight]; }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_FORMAT_H_ */ +#endif /* FORTRAN_FLANG_RT_FORMAT_H_ */ diff --git a/FortranRuntime/lib/Runtime/inquiry.cpp b/flang-rt/lib/flang_rt/inquiry.cpp similarity index 96% rename from FortranRuntime/lib/Runtime/inquiry.cpp rename to flang-rt/lib/flang_rt/inquiry.cpp index c24492754b4f43..b29ab4ee3c6663 100644 --- a/FortranRuntime/lib/Runtime/inquiry.cpp +++ b/flang-rt/lib/flang_rt/inquiry.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/inquiry.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/inquiry.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,8 +10,8 @@ // inquire about shape information of arrays -- LBOUND and SIZE. #include "flang/Runtime/inquiry.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "copy.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include diff --git a/FortranRuntime/lib/Runtime/internal-unit.cpp b/flang-rt/lib/flang_rt/internal-unit.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/internal-unit.cpp rename to flang-rt/lib/flang_rt/internal-unit.cpp index 4494de9dddc1a1..7775ded1e86d57 100644 --- a/FortranRuntime/lib/Runtime/internal-unit.cpp +++ b/flang-rt/lib/flang_rt/internal-unit.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/internal-unit.cpp ---------------------------*- C++ -*-===// +//===-- lib/flang_rt/internal-unit.cpp --------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "internal-unit.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "io-error.h" #include "flang/Runtime/freestanding-tools.h" #include diff --git a/FortranRuntime/lib/Runtime/internal-unit.h b/flang-rt/lib/flang_rt/internal-unit.h similarity index 89% rename from FortranRuntime/lib/Runtime/internal-unit.h rename to flang-rt/lib/flang_rt/internal-unit.h index 7579016f14646d..2f7d0220b84b37 100644 --- a/FortranRuntime/lib/Runtime/internal-unit.h +++ b/flang-rt/lib/flang_rt/internal-unit.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/internal-unit.h -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/internal-unit.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. @@ -8,11 +8,11 @@ // Fortran internal I/O "units" -#ifndef FORTRAN_RUNTIME_INTERNAL_UNIT_H_ -#define FORTRAN_RUNTIME_INTERNAL_UNIT_H_ +#ifndef FORTRAN_FLANG_RT_INTERNAL_UNIT_H_ +#define FORTRAN_FLANG_RT_INTERNAL_UNIT_H_ -#include "FortranRuntime/Runtime/descriptor.h" #include "connection.h" +#include "flang-rt/flang_rt/descriptor.h" #include #include @@ -56,4 +56,4 @@ template class InternalDescriptorUnit : public ConnectionState { extern template class InternalDescriptorUnit; extern template class InternalDescriptorUnit; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_INTERNAL_UNIT_H_ */ +#endif /* FORTRAN_FLANG_RT_INTERNAL_UNIT_H_ */ diff --git a/FortranRuntime/lib/Runtime/io-api-common.h b/flang-rt/lib/flang_rt/io-api-common.h similarity index 92% rename from FortranRuntime/lib/Runtime/io-api-common.h rename to flang-rt/lib/flang_rt/io-api-common.h index fed1d11d6ce6a6..5ff1b57c73cda6 100644 --- a/FortranRuntime/lib/Runtime/io-api-common.h +++ b/flang-rt/lib/flang_rt/io-api-common.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-api-common.h -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-api-common.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. @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_IO_API_COMMON_H_ -#define FORTRAN_RUNTIME_IO_API_COMMON_H_ +#ifndef FORTRAN_FLANG_RT_IO_API_COMMON_H_ +#define FORTRAN_FLANG_RT_IO_API_COMMON_H_ -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "io-stmt.h" #include "terminator.h" #include "unit.h" @@ -94,4 +94,4 @@ RT_API_ATTRS Cookie BeginExternalListIO( } } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_IO_API_COMMON_H_ */ +#endif /* FORTRAN_FLANG_RT_IO_API_COMMON_H_ */ diff --git a/FortranRuntime/lib/Runtime/io-api-minimal.cpp b/flang-rt/lib/flang_rt/io-api-minimal.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/io-api-minimal.cpp rename to flang-rt/lib/flang_rt/io-api-minimal.cpp index 8cde2333804572..92524430650126 100644 --- a/FortranRuntime/lib/Runtime/io-api-minimal.cpp +++ b/flang-rt/lib/flang_rt/io-api-minimal.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-api-minimal.cpp --------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-api-minimal.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,8 +9,8 @@ // Implements the subset of the I/O statement API needed for basic // list-directed output (PRINT *) of intrinsic types. -#include "FortranRuntime/Runtime/io-api-funcs.h" #include "edit-output.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "format.h" #include "io-api-common.h" #include "io-stmt.h" diff --git a/FortranRuntime/lib/Runtime/io-api.cpp b/flang-rt/lib/flang_rt/io-api.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/io-api.cpp rename to flang-rt/lib/flang_rt/io-api.cpp index fa95d68a004b51..0de1e24f71dac5 100644 --- a/FortranRuntime/lib/Runtime/io-api.cpp +++ b/flang-rt/lib/flang_rt/io-api.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-api.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-api.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -13,13 +13,13 @@ // OutputReal{32,64}, OutputComplex{32,64}, OutputAscii, & EndIoStatement() // are in runtime/io-api-minimal.cpp. -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" -#include "FortranRuntime/Runtime/memory.h" #include "descriptor-io.h" #include "edit-input.h" #include "edit-output.h" #include "environment.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" +#include "flang-rt/flang_rt/memory.h" #include "format.h" #include "io-api-common.h" #include "io-stmt.h" diff --git a/FortranRuntime/lib/Runtime/io-error.cpp b/flang-rt/lib/flang_rt/io-error.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/io-error.cpp rename to flang-rt/lib/flang_rt/io-error.cpp index 053667462058de..215c839d98cc35 100644 --- a/FortranRuntime/lib/Runtime/io-error.cpp +++ b/flang-rt/lib/flang_rt/io-error.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-error.cpp --------------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-error.cpp -------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/io-error.h b/flang-rt/lib/flang_rt/io-error.h similarity index 90% rename from FortranRuntime/lib/Runtime/io-error.h rename to flang-rt/lib/flang_rt/io-error.h index e2018cc2ea0ab1..7798d0830a1323 100644 --- a/FortranRuntime/lib/Runtime/io-error.h +++ b/flang-rt/lib/flang_rt/io-error.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-error.h ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-error.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,11 +12,11 @@ // IOSTAT error codes are raw errno values augmented with values for // Fortran-specific errors. -#ifndef FORTRAN_RUNTIME_IO_ERROR_H_ -#define FORTRAN_RUNTIME_IO_ERROR_H_ +#ifndef FORTRAN_FLANG_RT_IO_ERROR_H_ +#define FORTRAN_FLANG_RT_IO_ERROR_H_ -#include "FortranRuntime/Runtime/iostat-funcs.h" -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/iostat-funcs.h" +#include "flang-rt/flang_rt/memory.h" #include "terminator.h" #include @@ -78,4 +78,4 @@ class IoErrorHandler : public Terminator { }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_IO_ERROR_H_ */ +#endif /* FORTRAN_FLANG_RT_IO_ERROR_H_ */ diff --git a/FortranRuntime/lib/Runtime/io-stmt.cpp b/flang-rt/lib/flang_rt/io-stmt.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/io-stmt.cpp rename to flang-rt/lib/flang_rt/io-stmt.cpp index fe02e221671665..7c243a8c934a7a 100644 --- a/FortranRuntime/lib/Runtime/io-stmt.cpp +++ b/flang-rt/lib/flang_rt/io-stmt.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-stmt.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-stmt.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "io-stmt.h" -#include "FortranRuntime/Runtime/memory.h" #include "connection.h" #include "emit-encoded.h" +#include "flang-rt/flang_rt/memory.h" #include "format.h" #include "tools.h" #include "unit.h" diff --git a/FortranRuntime/lib/Runtime/io-stmt.h b/flang-rt/lib/flang_rt/io-stmt.h similarity index 99% rename from FortranRuntime/lib/Runtime/io-stmt.h rename to flang-rt/lib/flang_rt/io-stmt.h index 21746ff1966218..78bc42502be687 100644 --- a/FortranRuntime/lib/Runtime/io-stmt.h +++ b/flang-rt/lib/flang_rt/io-stmt.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/io-stmt.h -----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/io-stmt.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. @@ -8,13 +8,13 @@ // Representations of the state of an I/O statement in progress -#ifndef FORTRAN_RUNTIME_IO_STMT_H_ -#define FORTRAN_RUNTIME_IO_STMT_H_ +#ifndef FORTRAN_FLANG_RT_IO_STMT_H_ +#define FORTRAN_FLANG_RT_IO_STMT_H_ -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" #include "connection.h" #include "file.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "format.h" #include "internal-unit.h" #include "io-error.h" @@ -789,4 +789,4 @@ class ErroneousIoStatementState : public IoStatementBase { }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_IO_STMT_H_ */ +#endif /* FORTRAN_FLANG_RT_IO_STMT_H_ */ diff --git a/FortranRuntime/lib/Runtime/iostat.cpp b/flang-rt/lib/flang_rt/iostat.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/iostat.cpp rename to flang-rt/lib/flang_rt/iostat.cpp index 8d769a09252fd6..39f4474dcf7229 100644 --- a/FortranRuntime/lib/Runtime/iostat.cpp +++ b/flang-rt/lib/flang_rt/iostat.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/iostat.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/iostat.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/iostat-funcs.h" +#include "flang-rt/flang_rt/iostat-funcs.h" namespace Fortran::runtime::io { RT_OFFLOAD_API_GROUP_BEGIN diff --git a/FortranRuntime/lib/Runtime/lock.h b/flang-rt/lib/flang_rt/lock.h similarity index 94% rename from FortranRuntime/lib/Runtime/lock.h rename to flang-rt/lib/flang_rt/lock.h index 69ff6403736dae..955059a711c47d 100644 --- a/FortranRuntime/lib/Runtime/lock.h +++ b/flang-rt/lib/flang_rt/lock.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/lock.h --------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/lock.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. @@ -8,8 +8,8 @@ // Wraps a mutex -#ifndef FORTRAN_RUNTIME_LOCK_H_ -#define FORTRAN_RUNTIME_LOCK_H_ +#ifndef FORTRAN_FLANG_RT_LOCK_H_ +#define FORTRAN_FLANG_RT_LOCK_H_ #include "terminator.h" #include "tools.h" @@ -113,4 +113,4 @@ class CriticalSection { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_LOCK_H_ */ +#endif /* FORTRAN_FLANG_RT_LOCK_H_ */ diff --git a/FortranRuntime/lib/Runtime/main.cpp b/flang-rt/lib/flang_rt/main.cpp similarity index 95% rename from FortranRuntime/lib/Runtime/main.cpp rename to flang-rt/lib/flang_rt/main.cpp index 3fe985e524548d..71ed7f8319f60f 100644 --- a/FortranRuntime/lib/Runtime/main.cpp +++ b/flang-rt/lib/flang_rt/main.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/main.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/main.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/matmul-transpose.cpp b/flang-rt/lib/flang_rt/matmul-transpose.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/matmul-transpose.cpp rename to flang-rt/lib/flang_rt/matmul-transpose.cpp index ec5388e3fca793..2c7c4a89117f04 100644 --- a/FortranRuntime/lib/Runtime/matmul-transpose.cpp +++ b/flang-rt/lib/flang_rt/matmul-transpose.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/matmul-transpose.cpp ------------------------*- C++ -*-===// +//===-- lib/flang_rt/matmul-transpose.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -21,7 +21,7 @@ // to use the faster BLAS routines. #include "flang/Runtime/matmul-transpose.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Common/optional.h" diff --git a/FortranRuntime/lib/Runtime/matmul.cpp b/flang-rt/lib/flang_rt/matmul.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/matmul.cpp rename to flang-rt/lib/flang_rt/matmul.cpp index 01be7f7c75bc45..8157911f34fd38 100644 --- a/FortranRuntime/lib/Runtime/matmul.cpp +++ b/flang-rt/lib/flang_rt/matmul.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/matmul.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/matmul.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -20,7 +20,7 @@ // Places where BLAS routines could be called are marked as TODO items. #include "flang/Runtime/matmul.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Common/optional.h" diff --git a/FortranRuntime/lib/Runtime/memory.cpp b/flang-rt/lib/flang_rt/memory.cpp similarity index 92% rename from FortranRuntime/lib/Runtime/memory.cpp rename to flang-rt/lib/flang_rt/memory.cpp index a4cebf7edc6c64..66aa5be0cddc60 100644 --- a/FortranRuntime/lib/Runtime/memory.cpp +++ b/flang-rt/lib/flang_rt/memory.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/memory.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/memory.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "terminator.h" #include "tools.h" #include "flang/Runtime/freestanding-tools.h" diff --git a/FortranRuntime/lib/Runtime/misc-intrinsic.cpp b/flang-rt/lib/flang_rt/misc-intrinsic.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/misc-intrinsic.cpp rename to flang-rt/lib/flang_rt/misc-intrinsic.cpp index 91a3b136e009a5..00098c5b4e20b0 100644 --- a/FortranRuntime/lib/Runtime/misc-intrinsic.cpp +++ b/flang-rt/lib/flang_rt/misc-intrinsic.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/misc-intrinsic.cpp --------------------------*- C++ -*-===// +//===-- lib/flang_rt/misc-intrinsic.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/misc-intrinsic.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Common/optional.h" diff --git a/FortranRuntime/lib/Runtime/namelist.cpp b/flang-rt/lib/flang_rt/namelist.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/namelist.cpp rename to flang-rt/lib/flang_rt/namelist.cpp index 46036549bcd316..92dbd33b7f9609 100644 --- a/FortranRuntime/lib/Runtime/namelist.cpp +++ b/flang-rt/lib/flang_rt/namelist.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/namelist.cpp --------------------------------*- C++ -*-===// +//===-- lib/flang_rt/namelist.cpp -------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "namelist.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" #include "descriptor-io.h" #include "emit-encoded.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "io-stmt.h" #include #include diff --git a/FortranRuntime/lib/Runtime/namelist.h b/flang-rt/lib/flang_rt/namelist.h similarity index 91% rename from FortranRuntime/lib/Runtime/namelist.h rename to flang-rt/lib/flang_rt/namelist.h index 04432f8a08cb97..519ec5dd2ddbc5 100644 --- a/FortranRuntime/lib/Runtime/namelist.h +++ b/flang-rt/lib/flang_rt/namelist.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/namelist.h ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/namelist.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. @@ -8,8 +8,8 @@ // Defines the data structure used for NAMELIST I/O -#ifndef FORTRAN_RUNTIME_NAMELIST_H_ -#define FORTRAN_RUNTIME_NAMELIST_H_ +#ifndef FORTRAN_FLANG_RT_NAMELIST_H_ +#define FORTRAN_FLANG_RT_NAMELIST_H_ #include "non-tbp-dio.h" #include "flang/Common/api-attrs.h" @@ -51,4 +51,4 @@ class NamelistGroup { RT_API_ATTRS bool IsNamelistNameOrSlash(IoStatementState &); } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_NAMELIST_H_ */ +#endif /* FORTRAN_FLANG_RT_NAMELIST_H_ */ diff --git a/FortranRuntime/lib/Runtime/non-tbp-dio.cpp b/flang-rt/lib/flang_rt/non-tbp-dio.cpp similarity index 93% rename from FortranRuntime/lib/Runtime/non-tbp-dio.cpp rename to flang-rt/lib/flang_rt/non-tbp-dio.cpp index 9fa04397bc9610..3aade68cbb6d3e 100644 --- a/FortranRuntime/lib/Runtime/non-tbp-dio.cpp +++ b/flang-rt/lib/flang_rt/non-tbp-dio.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/non-tbp-dio.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/non-tbp-dio.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/non-tbp-dio.h b/flang-rt/lib/flang_rt/non-tbp-dio.h similarity index 91% rename from FortranRuntime/lib/Runtime/non-tbp-dio.h rename to flang-rt/lib/flang_rt/non-tbp-dio.h index 426d5a92fd37d4..dfc96603a8eb1c 100644 --- a/FortranRuntime/lib/Runtime/non-tbp-dio.h +++ b/flang-rt/lib/flang_rt/non-tbp-dio.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/non-tbp-dio.h -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/non-tbp-dio.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. @@ -19,8 +19,8 @@ // a containing scope has become inaccessible in a nested scope due // to the use of "IMPORT, NONE" or "IMPORT, ONLY:". -#ifndef FORTRAN_RUNTIME_NON_TBP_DIO_H_ -#define FORTRAN_RUNTIME_NON_TBP_DIO_H_ +#ifndef FORTRAN_FLANG_RT_NON_TBP_DIO_H_ +#define FORTRAN_FLANG_RT_NON_TBP_DIO_H_ #include "flang/Common/Fortran-consts.h" #include "flang/Common/api-attrs.h" @@ -53,4 +53,4 @@ struct NonTbpDefinedIoTable { }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_NON_TBP_DIO_H_ */ +#endif /* FORTRAN_FLANG_RT_NON_TBP_DIO_H_ */ diff --git a/FortranRuntime/lib/Runtime/numeric-templates.h b/flang-rt/lib/flang_rt/numeric-templates.h similarity index 98% rename from FortranRuntime/lib/Runtime/numeric-templates.h rename to flang-rt/lib/flang_rt/numeric-templates.h index 159b8b0b9579ad..0471b89f9153ad 100644 --- a/FortranRuntime/lib/Runtime/numeric-templates.h +++ b/flang-rt/lib/flang_rt/numeric-templates.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/numeric-templates.h -------------------------*- C++ -*-===// +//===-- lib/flang_rt/numeric-templates.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. @@ -15,8 +15,8 @@ // for the data type corresponding to CppTypeFor // on the target. -#ifndef FORTRAN_RUNTIME_NUMERIC_TEMPLATES_H_ -#define FORTRAN_RUNTIME_NUMERIC_TEMPLATES_H_ +#ifndef FORTRAN_FLANG_RT_NUMERIC_TEMPLATES_H_ +#define FORTRAN_FLANG_RT_NUMERIC_TEMPLATES_H_ #include "terminator.h" #include "tools.h" @@ -465,4 +465,4 @@ template inline RT_API_ATTRS T ErfcScaled(T arg) { } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_NUMERIC_TEMPLATES_H_ */ +#endif /* FORTRAN_FLANG_RT_NUMERIC_TEMPLATES_H_ */ diff --git a/FortranRuntime/lib/Runtime/numeric.cpp b/flang-rt/lib/flang_rt/numeric.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/numeric.cpp rename to flang-rt/lib/flang_rt/numeric.cpp index b0f68a7fc81d29..4c2c0394ede188 100644 --- a/FortranRuntime/lib/Runtime/numeric.cpp +++ b/flang-rt/lib/flang_rt/numeric.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/numeric.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/numeric.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/pointer.cpp b/flang-rt/lib/flang_rt/pointer.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/pointer.cpp rename to flang-rt/lib/flang_rt/pointer.cpp index fba9e639fa37a8..7479cd780709fa 100644 --- a/FortranRuntime/lib/Runtime/pointer.cpp +++ b/flang-rt/lib/flang_rt/pointer.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/pointer.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/pointer.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/product.cpp b/flang-rt/lib/flang_rt/product.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/product.cpp rename to flang-rt/lib/flang_rt/product.cpp index e4a6e81bd0c508..cd0c4e9440ceb3 100644 --- a/FortranRuntime/lib/Runtime/product.cpp +++ b/flang-rt/lib/flang_rt/product.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/product.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/product.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/pseudo-unit.cpp b/flang-rt/lib/flang_rt/pseudo-unit.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/pseudo-unit.cpp rename to flang-rt/lib/flang_rt/pseudo-unit.cpp index 62c6b1df5071c7..9ce39ca9307c9c 100644 --- a/FortranRuntime/lib/Runtime/pseudo-unit.cpp +++ b/flang-rt/lib/flang_rt/pseudo-unit.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/pseudo-unit.cpp -----------------------------*- C++ -*-===// +//===-- lib/flang_rt/pseudo-unit.cpp ----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/ragged.cpp b/flang-rt/lib/flang_rt/ragged.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/ragged.cpp rename to flang-rt/lib/flang_rt/ragged.cpp index 681a800e29dca7..df6469e9c5ba27 100644 --- a/FortranRuntime/lib/Runtime/ragged.cpp +++ b/flang-rt/lib/flang_rt/ragged.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/ragged.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/ragged.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/random-templates.h b/flang-rt/lib/flang_rt/random-templates.h similarity index 91% rename from FortranRuntime/lib/Runtime/random-templates.h rename to flang-rt/lib/flang_rt/random-templates.h index 9faa9c7cfa7002..475c972a823226 100644 --- a/FortranRuntime/lib/Runtime/random-templates.h +++ b/flang-rt/lib/flang_rt/random-templates.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/random-templates.h --------------------------*- C++ -*-===// +//===-- lib/flang_rt/random-templates.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. @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_RANDOM_TEMPLATES_H_ -#define FORTRAN_RUNTIME_RANDOM_TEMPLATES_H_ +#ifndef FORTRAN_FLANG_RT_RANDOM_TEMPLATES_H_ +#define FORTRAN_FLANG_RT_RANDOM_TEMPLATES_H_ -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "lock.h" #include "numeric-templates.h" #include "flang/Common/optional.h" @@ -85,4 +85,4 @@ inline void Generate(const Descriptor &harvest) { } // namespace Fortran::runtime::random -#endif /* FORTRAN_RUNTIME_RANDOM_TEMPLATES_H_ */ +#endif /* FORTRAN_FLANG_RT_RANDOM_TEMPLATES_H_ */ diff --git a/FortranRuntime/lib/Runtime/random.cpp b/flang-rt/lib/flang_rt/random.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/random.cpp rename to flang-rt/lib/flang_rt/random.cpp index 911b59b508eb4f..9922ae87b084a8 100644 --- a/FortranRuntime/lib/Runtime/random.cpp +++ b/flang-rt/lib/flang_rt/random.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/random.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/random.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,7 +10,7 @@ // RANDOM_SEED. #include "flang/Runtime/random.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "lock.h" #include "random-templates.h" #include "terminator.h" diff --git a/FortranRuntime/lib/Runtime/reduce.cpp b/flang-rt/lib/flang_rt/reduce.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/reduce.cpp rename to flang-rt/lib/flang_rt/reduce.cpp index a020ffef6fe6a5..6997d4c63065b9 100644 --- a/FortranRuntime/lib/Runtime/reduce.cpp +++ b/flang-rt/lib/flang_rt/reduce.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/reduce.cpp ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/reduce.cpp ---------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,7 +9,7 @@ // REDUCE() implementation #include "flang/Runtime/reduce.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "reduction-templates.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/reduction-templates.h b/flang-rt/lib/flang_rt/reduction-templates.h similarity index 98% rename from FortranRuntime/lib/Runtime/reduction-templates.h rename to flang-rt/lib/flang_rt/reduction-templates.h index 714584ec613ba3..774b6f3c99850f 100644 --- a/FortranRuntime/lib/Runtime/reduction-templates.h +++ b/flang-rt/lib/flang_rt/reduction-templates.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/reduction-templates.h -----------------------*- C++ -*-===// +//===-- lib/flang_rt/reduction-templates.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. @@ -18,10 +18,10 @@ // * Character-valued reductions (MAXVAL & MINVAL) return arbitrary // length results, dynamically allocated in a caller-supplied descriptor -#ifndef FORTRAN_RUNTIME_REDUCTION_TEMPLATES_H_ -#define FORTRAN_RUNTIME_REDUCTION_TEMPLATES_H_ +#ifndef FORTRAN_FLANG_RT_REDUCTION_TEMPLATES_H_ +#define FORTRAN_FLANG_RT_REDUCTION_TEMPLATES_H_ -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "numeric-templates.h" #include "terminator.h" #include "tools.h" @@ -412,4 +412,4 @@ template struct Norm2Helper { }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_REDUCTION_TEMPLATES_H_ */ +#endif /* FORTRAN_FLANG_RT_REDUCTION_TEMPLATES_H_ */ diff --git a/FortranRuntime/lib/Runtime/reduction.cpp b/flang-rt/lib/flang_rt/reduction.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/reduction.cpp rename to flang-rt/lib/flang_rt/reduction.cpp index 21930fee07ead7..f9d5f442e8928f 100644 --- a/FortranRuntime/lib/Runtime/reduction.cpp +++ b/flang-rt/lib/flang_rt/reduction.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/reduction.cpp -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/reduction.cpp ------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -14,7 +14,7 @@ // NORM2, MAXLOC, MINLOC, MAXVAL, and MINVAL are in extrema.cpp. #include "flang/Runtime/reduction.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "reduction-templates.h" #include diff --git a/FortranRuntime/lib/Runtime/stack.h b/flang-rt/lib/flang_rt/stack.h similarity index 94% rename from FortranRuntime/lib/Runtime/stack.h rename to flang-rt/lib/flang_rt/stack.h index 36e2d0a103a887..4c1ab4e85ed71f 100644 --- a/FortranRuntime/lib/Runtime/stack.h +++ b/flang-rt/lib/flang_rt/stack.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/stack.h -------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/stack.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. @@ -10,10 +10,10 @@ // It is a list based stack with dynamic allocation/deallocation // of the list nodes. -#ifndef FORTRAN_RUNTIME_STACK_H_ -#define FORTRAN_RUNTIME_STACK_H_ +#ifndef FORTRAN_FLANG_RT_STACK_H_ +#define FORTRAN_FLANG_RT_STACK_H_ -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "terminator.h" namespace Fortran::runtime { @@ -133,4 +133,4 @@ template class Stack : public StackStorage { Terminator &terminator_; }; } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_STACK_H_ */ +#endif /* FORTRAN_FLANG_RT_STACK_H_ */ diff --git a/FortranRuntime/lib/Runtime/stat.cpp b/flang-rt/lib/flang_rt/stat.cpp similarity index 96% rename from FortranRuntime/lib/Runtime/stat.cpp rename to flang-rt/lib/flang_rt/stat.cpp index 1af6c43102518b..77eefe3d1ac518 100644 --- a/FortranRuntime/lib/Runtime/stat.cpp +++ b/flang-rt/lib/flang_rt/stat.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/stat.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/stat.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "stat.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" diff --git a/FortranRuntime/lib/Runtime/stat.h b/flang-rt/lib/flang_rt/stat.h similarity index 93% rename from FortranRuntime/lib/Runtime/stat.h rename to flang-rt/lib/flang_rt/stat.h index eccd69024d726b..dbab381001d7d8 100644 --- a/FortranRuntime/lib/Runtime/stat.h +++ b/flang-rt/lib/flang_rt/stat.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/stat.h --------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/stat.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. @@ -9,8 +9,8 @@ // Defines the values returned by the runtime for STAT= specifiers // on executable statements. -#ifndef FORTRAN_RUNTIME_STAT_H_ -#define FORTRAN_RUNTIME_STAT_H_ +#ifndef FORTRAN_FLANG_RT_STAT_H_ +#define FORTRAN_FLANG_RT_STAT_H_ #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "flang/Common/api-attrs.h" #include "flang/Runtime/magic-numbers.h" @@ -60,4 +60,4 @@ RT_API_ATTRS int ToErrmsg(const Descriptor *errmsg, int stat); // returns stat RT_API_ATTRS int ReturnError(Terminator &, int stat, const Descriptor *errmsg = nullptr, bool hasStat = false); } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_STAT_H_ */ +#endif /* FORTRAN_FLANG_RT_STAT_H_ */ diff --git a/FortranRuntime/lib/Runtime/stop.cpp b/flang-rt/lib/flang_rt/stop.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/stop.cpp rename to flang-rt/lib/flang_rt/stop.cpp index 8465a53168e551..ea50d1ba4747ff 100644 --- a/FortranRuntime/lib/Runtime/stop.cpp +++ b/flang-rt/lib/flang_rt/stop.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/stop.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/stop.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/sum.cpp b/flang-rt/lib/flang_rt/sum.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/sum.cpp rename to flang-rt/lib/flang_rt/sum.cpp index 64982b9fd53690..3c225efe8a2788 100644 --- a/FortranRuntime/lib/Runtime/sum.cpp +++ b/flang-rt/lib/flang_rt/sum.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/sum.cpp -------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/sum.cpp ------------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/support.cpp b/flang-rt/lib/flang_rt/support.cpp similarity index 93% rename from FortranRuntime/lib/Runtime/support.cpp rename to flang-rt/lib/flang_rt/support.cpp index 798d502ba248e2..436ae6f87ae692 100644 --- a/FortranRuntime/lib/Runtime/support.cpp +++ b/flang-rt/lib/flang_rt/support.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/support.cpp ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/support.cpp --------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/support.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "ISO_Fortran_util.h" +#include "flang-rt/flang_rt/descriptor.h" #include "type-info.h" namespace Fortran::runtime { diff --git a/FortranRuntime/lib/Runtime/temporary-stack.cpp b/flang-rt/lib/flang_rt/temporary-stack.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/temporary-stack.cpp rename to flang-rt/lib/flang_rt/temporary-stack.cpp index d8ff08e51cc211..f566e6d8a086ff 100644 --- a/FortranRuntime/lib/Runtime/temporary-stack.cpp +++ b/flang-rt/lib/flang_rt/temporary-stack.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/temporary-stack.cpp -------------------------*- C++ -*-===// +//===-- lib/flang_rt/temporary-stack.cpp ------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,8 +10,8 @@ // temporaries. For use in HLFIR lowering. #include "flang/Runtime/temporary-stack.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/memory.h" #include "terminator.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "flang/Runtime/assign.h" diff --git a/FortranRuntime/lib/Runtime/terminator.cpp b/flang-rt/lib/flang_rt/terminator.cpp similarity index 97% rename from FortranRuntime/lib/Runtime/terminator.cpp rename to flang-rt/lib/flang_rt/terminator.cpp index 4146e28235511f..2e8d895a9025a6 100644 --- a/FortranRuntime/lib/Runtime/terminator.cpp +++ b/flang-rt/lib/flang_rt/terminator.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/terminator.cpp ------------------------------*- C++ -*-===// +//===-- lib/flang_rt/terminator.cpp -----------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/terminator.h b/flang-rt/lib/flang_rt/terminator.h similarity index 95% rename from FortranRuntime/lib/Runtime/terminator.h rename to flang-rt/lib/flang_rt/terminator.h index f475658b0eab3d..61c6452a282d12 100644 --- a/FortranRuntime/lib/Runtime/terminator.h +++ b/flang-rt/lib/flang_rt/terminator.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/terminator.h --------------------------------*- C++ -*-===// +//===-- lib/flang_rt/terminator.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. @@ -8,8 +8,8 @@ // Termination of the image -#ifndef FORTRAN_RUNTIME_TERMINATOR_H_ -#define FORTRAN_RUNTIME_TERMINATOR_H_ +#ifndef FORTRAN_FLANG_RT_TERMINATOR_H_ +#define FORTRAN_FLANG_RT_TERMINATOR_H_ #include "flang/Common/api-attrs.h" #include @@ -121,4 +121,4 @@ namespace Fortran::runtime::io { RT_API_ATTRS void FlushOutputOnCrash(const Terminator &); } -#endif /* FORTRAN_RUNTIME_TERMINATOR_H_ */ +#endif /* FORTRAN_FLANG_RT_TERMINATOR_H_ */ diff --git a/FortranRuntime/lib/Runtime/time-intrinsic.cpp b/flang-rt/lib/flang_rt/time-intrinsic.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/time-intrinsic.cpp rename to flang-rt/lib/flang_rt/time-intrinsic.cpp index 15c42077c0afd5..daba1bd8f6b8f5 100644 --- a/FortranRuntime/lib/Runtime/time-intrinsic.cpp +++ b/flang-rt/lib/flang_rt/time-intrinsic.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/time-intrinsic.cpp --------------------------*- C++ -*-===// +//===-- lib/flang_rt/time-intrinsic.cpp -------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,7 +9,7 @@ // Implements time-related intrinsic subroutines. #include "flang/Runtime/time-intrinsic.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Runtime/cpp-type.h" diff --git a/FortranRuntime/lib/Runtime/tools.cpp b/flang-rt/lib/flang_rt/tools.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/tools.cpp rename to flang-rt/lib/flang_rt/tools.cpp index d5c113a31fc501..228b781b207ddd 100644 --- a/FortranRuntime/lib/Runtime/tools.cpp +++ b/flang-rt/lib/flang_rt/tools.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/tools.cpp -----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/tools.cpp ----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/tools.h b/flang-rt/lib/flang_rt/tools.h similarity index 98% rename from FortranRuntime/lib/Runtime/tools.h rename to flang-rt/lib/flang_rt/tools.h index 332ffac77f2595..9880d0e93f5a82 100644 --- a/FortranRuntime/lib/Runtime/tools.h +++ b/flang-rt/lib/flang_rt/tools.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/tools.h -------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/tools.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. @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_TOOLS_H_ -#define FORTRAN_RUNTIME_TOOLS_H_ +#ifndef FORTRAN_FLANG_RT_TOOLS_H_ +#define FORTRAN_FLANG_RT_TOOLS_H_ -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/memory.h" #include "stat.h" #include "terminator.h" #include "flang/Common/optional.h" @@ -535,4 +535,4 @@ RT_API_ATTRS void CreatePartialReductionResult(Descriptor &result, const char *intrinsic, TypeCode); } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_TOOLS_H_ */ +#endif /* FORTRAN_FLANG_RT_TOOLS_H_ */ diff --git a/FortranRuntime/lib/Runtime/transformational.cpp b/flang-rt/lib/flang_rt/transformational.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/transformational.cpp rename to flang-rt/lib/flang_rt/transformational.cpp index 28dd02a28036de..f21c63fbfd7a1b 100644 --- a/FortranRuntime/lib/Runtime/transformational.cpp +++ b/flang-rt/lib/flang_rt/transformational.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/transformational.cpp ------------------------*- C++ -*-===// +//===-- lib/flang_rt/transformational.cpp -----------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -17,8 +17,8 @@ // of the standard but it more likely to conform with its intent. #include "flang/Runtime/transformational.h" -#include "FortranRuntime/Runtime/descriptor.h" #include "copy.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "tools.h" #include "flang/Common/float128.h" diff --git a/FortranRuntime/lib/Runtime/type-code.cpp b/flang-rt/lib/flang_rt/type-code.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/type-code.cpp rename to flang-rt/lib/flang_rt/type-code.cpp index 16f5497bc7a709..96fabf7ec7698f 100644 --- a/FortranRuntime/lib/Runtime/type-code.cpp +++ b/flang-rt/lib/flang_rt/type-code.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/type-code.cpp -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/type-code.cpp ------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/type-code.h" #include namespace Fortran::runtime { diff --git a/FortranRuntime/lib/Runtime/type-info.cpp b/flang-rt/lib/flang_rt/type-info.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/type-info.cpp rename to flang-rt/lib/flang_rt/type-info.cpp index 19e9211fc063f4..031721833ddebc 100644 --- a/FortranRuntime/lib/Runtime/type-info.cpp +++ b/flang-rt/lib/flang_rt/type-info.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/type-info.cpp -------------------------------*- C++ -*-===// +//===-- lib/flang_rt/type-info.cpp ------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/type-info.h b/flang-rt/lib/flang_rt/type-info.h similarity index 98% rename from FortranRuntime/lib/Runtime/type-info.h rename to flang-rt/lib/flang_rt/type-info.h index 150942547c2ee8..3b0b193d63379c 100644 --- a/FortranRuntime/lib/Runtime/type-info.h +++ b/flang-rt/lib/flang_rt/type-info.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/type-info.h ---------------------------------*- C++ -*-===// +//===-- lib/flang_rt/type-info.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. @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef FORTRAN_RUNTIME_TYPE_INFO_H_ -#define FORTRAN_RUNTIME_TYPE_INFO_H_ +#ifndef FORTRAN_FLANG_RT_TYPE_INFO_H_ +#define FORTRAN_FLANG_RT_TYPE_INFO_H_ // A C++ perspective of the derived type description schemata in // flang/module/__fortran_type_info.f90. -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "terminator.h" #include "flang/Common/Fortran-consts.h" #include "flang/Common/bit-population-count.h" @@ -321,4 +321,4 @@ class DerivedType { }; } // namespace Fortran::runtime::typeInfo -#endif /* FORTRAN_RUNTIME_TYPE_INFO_H_ */ +#endif /* FORTRAN_FLANG_RT_TYPE_INFO_H_ */ diff --git a/FortranRuntime/lib/Runtime/unit-map.cpp b/flang-rt/lib/flang_rt/unit-map.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/unit-map.cpp rename to flang-rt/lib/flang_rt/unit-map.cpp index 93958be8df7ea5..0fda53ac071b27 100644 --- a/FortranRuntime/lib/Runtime/unit-map.cpp +++ b/flang-rt/lib/flang_rt/unit-map.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/unit-map.cpp --------------------------------*- C++ -*-===// +//===-- lib/flang_rt/unit-map.cpp -------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/unit-map.h b/flang-rt/lib/flang_rt/unit-map.h similarity index 93% rename from FortranRuntime/lib/Runtime/unit-map.h rename to flang-rt/lib/flang_rt/unit-map.h index f37e2df7f3b15a..7215a5677f006b 100644 --- a/FortranRuntime/lib/Runtime/unit-map.h +++ b/flang-rt/lib/flang_rt/unit-map.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/unit-map.h ----------------------------------*- C++ -*-===// +//===-- lib/flang_rt/unit-map.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. @@ -9,10 +9,10 @@ // Maps Fortran unit numbers to their ExternalFileUnit instances. // A simple hash table with forward-linked chains per bucket. -#ifndef FORTRAN_RUNTIME_UNIT_MAP_H_ -#define FORTRAN_RUNTIME_UNIT_MAP_H_ +#ifndef FORTRAN_FLANG_RT_UNIT_MAP_H_ +#define FORTRAN_FLANG_RT_UNIT_MAP_H_ -#include "FortranRuntime/Runtime/memory.h" +#include "flang-rt/flang_rt/memory.h" #include "lock.h" #include "unit.h" #include "flang/Common/fast-int-set.h" @@ -100,4 +100,4 @@ class UnitMap { int emergencyNewUnit_{maxNewUnits_}; // not recycled }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_UNIT_MAP_H_ */ +#endif /* FORTRAN_FLANG_RT_UNIT_MAP_H_ */ diff --git a/FortranRuntime/lib/Runtime/unit.cpp b/flang-rt/lib/flang_rt/unit.cpp similarity index 99% rename from FortranRuntime/lib/Runtime/unit.cpp rename to flang-rt/lib/flang_rt/unit.cpp index 496679ee8ce5f4..d65ae8962541e4 100644 --- a/FortranRuntime/lib/Runtime/unit.cpp +++ b/flang-rt/lib/flang_rt/unit.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/unit.cpp ------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/unit.cpp -----------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/unit.h b/flang-rt/lib/flang_rt/unit.h similarity index 98% rename from FortranRuntime/lib/Runtime/unit.h rename to flang-rt/lib/flang_rt/unit.h index 4a7444aedbe5b6..077a34833734ac 100644 --- a/FortranRuntime/lib/Runtime/unit.h +++ b/flang-rt/lib/flang_rt/unit.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/unit.h --------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/unit.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. @@ -8,14 +8,14 @@ // Fortran external I/O units -#ifndef FORTRAN_RUNTIME_UNIT_H_ -#define FORTRAN_RUNTIME_UNIT_H_ +#ifndef FORTRAN_FLANG_RT_UNIT_H_ +#define FORTRAN_FLANG_RT_UNIT_H_ -#include "FortranRuntime/Runtime/memory.h" #include "buffer.h" #include "connection.h" #include "environment.h" #include "file.h" +#include "flang-rt/flang_rt/memory.h" #include "format.h" #include "io-error.h" #include "io-stmt.h" @@ -291,4 +291,4 @@ class ChildIo { }; } // namespace Fortran::runtime::io -#endif /* FORTRAN_RUNTIME_UNIT_H_ */ +#endif /* FORTRAN_FLANG_RT_UNIT_H_ */ diff --git a/FortranRuntime/lib/Runtime/utf.cpp b/flang-rt/lib/flang_rt/utf.cpp similarity index 98% rename from FortranRuntime/lib/Runtime/utf.cpp rename to flang-rt/lib/flang_rt/utf.cpp index 635451153d39a6..46400668745ce7 100644 --- a/FortranRuntime/lib/Runtime/utf.cpp +++ b/flang-rt/lib/flang_rt/utf.cpp @@ -1,4 +1,4 @@ -//===-- lib/Runtime/utf.cpp -------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/utf.cpp ------------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/FortranRuntime/lib/Runtime/utf.h b/flang-rt/lib/flang_rt/utf.h similarity index 94% rename from FortranRuntime/lib/Runtime/utf.h rename to flang-rt/lib/flang_rt/utf.h index 35c03fd4cdded5..71dc7b05a77513 100644 --- a/FortranRuntime/lib/Runtime/utf.h +++ b/flang-rt/lib/flang_rt/utf.h @@ -1,4 +1,4 @@ -//===-- lib/Runtime/utf.h ---------------------------------------*- C++ -*-===// +//===-- lib/flang_rt/utf.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. @@ -38,8 +38,8 @@ // standard maximum. However, we support extended forms up to 32 bits so that // CHARACTER(KIND=4) can be abused to hold arbitrary 32-bit data. -#ifndef FORTRAN_RUNTIME_UTF_H_ -#define FORTRAN_RUNTIME_UTF_H_ +#ifndef FORTRAN_FLANG_RT_UTF_H_ +#define FORTRAN_FLANG_RT_UTF_H_ #include "flang/Common/optional.h" #include @@ -70,4 +70,4 @@ RT_API_ATTRS Fortran::common::optional DecodeUTF8(const char *); RT_API_ATTRS std::size_t EncodeUTF8(char *, char32_t); } // namespace Fortran::runtime -#endif /* FORTRAN_RUNTIME_UTF_H_ */ +#endif /* FORTRAN_FLANG_RT_UTF_H_ */ diff --git a/FortranRuntime/test/Driver/ctofortran.f90 b/flang-rt/test/Driver/ctofortran.f90 similarity index 100% rename from FortranRuntime/test/Driver/ctofortran.f90 rename to flang-rt/test/Driver/ctofortran.f90 diff --git a/FortranRuntime/test/Driver/exec.f90 b/flang-rt/test/Driver/exec.f90 similarity index 100% rename from FortranRuntime/test/Driver/exec.f90 rename to flang-rt/test/Driver/exec.f90 diff --git a/FortranRuntime/test/Runtime/no-cpp-dep.c b/flang-rt/test/Runtime/no-cpp-dep.c similarity index 100% rename from FortranRuntime/test/Runtime/no-cpp-dep.c rename to flang-rt/test/Runtime/no-cpp-dep.c diff --git a/FortranRuntime/unittests/Evaluate/CMakeLists.txt b/flang-rt/unittests/Evaluate/CMakeLists.txt similarity index 100% rename from FortranRuntime/unittests/Evaluate/CMakeLists.txt rename to flang-rt/unittests/Evaluate/CMakeLists.txt diff --git a/FortranRuntime/unittests/Evaluate/ISO-Fortran-binding.cpp b/flang-rt/unittests/Evaluate/ISO-Fortran-binding.cpp similarity index 99% rename from FortranRuntime/unittests/Evaluate/ISO-Fortran-binding.cpp rename to flang-rt/unittests/Evaluate/ISO-Fortran-binding.cpp index b68dfbcbd5b335..03cc59291787aa 100644 --- a/FortranRuntime/unittests/Evaluate/ISO-Fortran-binding.cpp +++ b/flang-rt/unittests/Evaluate/ISO-Fortran-binding.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" #include "flang/Testing/testing.h" #include "llvm/Support/raw_ostream.h" diff --git a/FortranRuntime/unittests/Evaluate/reshape.cpp b/flang-rt/unittests/Evaluate/reshape.cpp similarity index 98% rename from FortranRuntime/unittests/Evaluate/reshape.cpp rename to flang-rt/unittests/Evaluate/reshape.cpp index 0233ab37e25c6e..c9ead4fe744f91 100644 --- a/FortranRuntime/unittests/Evaluate/reshape.cpp +++ b/flang-rt/unittests/Evaluate/reshape.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "flang/Runtime/transformational.h" #include "flang/Testing/testing.h" #include diff --git a/FortranRuntime/unittests/Runtime/AccessTest.cpp b/flang-rt/unittests/Runtime/AccessTest.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/AccessTest.cpp rename to flang-rt/unittests/Runtime/AccessTest.cpp diff --git a/FortranRuntime/unittests/Runtime/Allocatable.cpp b/flang-rt/unittests/Runtime/Allocatable.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/Allocatable.cpp rename to flang-rt/unittests/Runtime/Allocatable.cpp diff --git a/FortranRuntime/unittests/Runtime/ArrayConstructor.cpp b/flang-rt/unittests/Runtime/ArrayConstructor.cpp similarity index 97% rename from FortranRuntime/unittests/Runtime/ArrayConstructor.cpp rename to flang-rt/unittests/Runtime/ArrayConstructor.cpp index 9d9a4ddae8689f..c52ce8e4ea54fd 100644 --- a/FortranRuntime/unittests/Runtime/ArrayConstructor.cpp +++ b/flang-rt/unittests/Runtime/ArrayConstructor.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/array-constructor.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/array-constructor.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Runtime/allocatable.h" diff --git a/FortranRuntime/unittests/Runtime/BufferTest.cpp b/flang-rt/unittests/Runtime/BufferTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/BufferTest.cpp rename to flang-rt/unittests/Runtime/BufferTest.cpp index 9a7dd86d0c1dc6..41c660e638e712 100644 --- a/FortranRuntime/unittests/Runtime/BufferTest.cpp +++ b/flang-rt/unittests/Runtime/BufferTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "../../lib/Runtime/buffer.h" +#include "../../lib/flang_rt/buffer.h" #include "CrashHandlerFixture.h" #include "gtest/gtest.h" #include diff --git a/FortranRuntime/unittests/Runtime/CMakeLists.txt b/flang-rt/unittests/Runtime/CMakeLists.txt similarity index 100% rename from FortranRuntime/unittests/Runtime/CMakeLists.txt rename to flang-rt/unittests/Runtime/CMakeLists.txt diff --git a/FortranRuntime/unittests/Runtime/CUDA/AllocatorCUF.cpp b/flang-rt/unittests/Runtime/CUDA/AllocatorCUF.cpp similarity index 90% rename from FortranRuntime/unittests/Runtime/CUDA/AllocatorCUF.cpp rename to flang-rt/unittests/Runtime/CUDA/AllocatorCUF.cpp index d2a2e5a11abf80..46461a863c0696 100644 --- a/FortranRuntime/unittests/Runtime/CUDA/AllocatorCUF.cpp +++ b/flang-rt/unittests/Runtime/CUDA/AllocatorCUF.cpp @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/CUDA/allocator.h" -#include "FortranRuntime/Runtime/CUDA/descriptor.h" -#include "FortranRuntime/Runtime/allocatable.h" -#include "FortranRuntime/Runtime/allocator-registry.h" +#include "cuda_runtime.h" +#include "flang-rt/flang_rt/allocator-registry.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" -#include "../../../runtime/terminator.h" +#include "../../../lib/flang_rt/terminator.h" +#include "flang-rt/CufRuntime/allocator.h" +#include "flang/Runtime/CUDA/descriptor.h" +#include "flang/Runtime/allocatable.h" #include "flang/Support/Fortran.h" -#include "cuda_runtime.h" - using namespace Fortran::runtime; using namespace Fortran::runtime::cuda; diff --git a/FortranRuntime/unittests/Runtime/CUDA/CMakeLists.txt b/flang-rt/unittests/Runtime/CUDA/CMakeLists.txt similarity index 100% rename from FortranRuntime/unittests/Runtime/CUDA/CMakeLists.txt rename to flang-rt/unittests/Runtime/CUDA/CMakeLists.txt diff --git a/FortranRuntime/unittests/Runtime/CharacterTest.cpp b/flang-rt/unittests/Runtime/CharacterTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/CharacterTest.cpp rename to flang-rt/unittests/Runtime/CharacterTest.cpp index 610061e2122cd5..3a4b5706e53849 100644 --- a/FortranRuntime/unittests/Runtime/CharacterTest.cpp +++ b/flang-rt/unittests/Runtime/CharacterTest.cpp @@ -10,7 +10,7 @@ // in Fortran. #include "flang/Runtime/character.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" #include #include diff --git a/FortranRuntime/unittests/Runtime/CommandTest.cpp b/flang-rt/unittests/Runtime/CommandTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/CommandTest.cpp rename to flang-rt/unittests/Runtime/CommandTest.cpp index a7d68508c5abca..15b2ed2e42bba1 100644 --- a/FortranRuntime/unittests/Runtime/CommandTest.cpp +++ b/flang-rt/unittests/Runtime/CommandTest.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/command.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "flang/Runtime/execute.h" diff --git a/FortranRuntime/unittests/Runtime/Complex.cpp b/flang-rt/unittests/Runtime/Complex.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/Complex.cpp rename to flang-rt/unittests/Runtime/Complex.cpp diff --git a/FortranRuntime/unittests/Runtime/CrashHandlerFixture.cpp b/flang-rt/unittests/Runtime/CrashHandlerFixture.cpp similarity index 96% rename from FortranRuntime/unittests/Runtime/CrashHandlerFixture.cpp rename to flang-rt/unittests/Runtime/CrashHandlerFixture.cpp index 5e0b746c7e974a..3959b0d4b78809 100644 --- a/FortranRuntime/unittests/Runtime/CrashHandlerFixture.cpp +++ b/flang-rt/unittests/Runtime/CrashHandlerFixture.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "../../lib/Runtime/terminator.h" +#include "../../lib/flang_rt/terminator.h" #include #include diff --git a/FortranRuntime/unittests/Runtime/CrashHandlerFixture.h b/flang-rt/unittests/Runtime/CrashHandlerFixture.h similarity index 100% rename from FortranRuntime/unittests/Runtime/CrashHandlerFixture.h rename to flang-rt/unittests/Runtime/CrashHandlerFixture.h diff --git a/FortranRuntime/unittests/Runtime/Derived.cpp b/flang-rt/unittests/Runtime/Derived.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/Derived.cpp rename to flang-rt/unittests/Runtime/Derived.cpp index 22361352fdf5d9..055174a3b5a907 100644 --- a/FortranRuntime/unittests/Runtime/Derived.cpp +++ b/flang-rt/unittests/Runtime/Derived.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Runtime/derived-api.h" diff --git a/FortranRuntime/unittests/Runtime/ExternalIOTest.cpp b/flang-rt/unittests/Runtime/ExternalIOTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/ExternalIOTest.cpp rename to flang-rt/unittests/Runtime/ExternalIOTest.cpp index 7ff4aa3c14bdc5..a93ee97da8f5f7 100644 --- a/FortranRuntime/unittests/Runtime/ExternalIOTest.cpp +++ b/flang-rt/unittests/Runtime/ExternalIOTest.cpp @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "gtest/gtest.h" #include "flang/Runtime/main.h" #include "flang/Runtime/stop.h" diff --git a/FortranRuntime/unittests/Runtime/Format.cpp b/flang-rt/unittests/Runtime/Format.cpp similarity index 97% rename from FortranRuntime/unittests/Runtime/Format.cpp rename to flang-rt/unittests/Runtime/Format.cpp index f1447608917f2d..3012806a8eacc1 100644 --- a/FortranRuntime/unittests/Runtime/Format.cpp +++ b/flang-rt/unittests/Runtime/Format.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "../../lib/Runtime/connection.h" -#include "../../lib/Runtime/format-implementation.h" -#include "../../lib/Runtime/io-error.h" +#include "../../lib/flang_rt/connection.h" +#include "../../lib/flang_rt/format-implementation.h" +#include "../../lib/flang_rt/io-error.h" #include #include #include diff --git a/FortranRuntime/unittests/Runtime/Inquiry.cpp b/flang-rt/unittests/Runtime/Inquiry.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/Inquiry.cpp rename to flang-rt/unittests/Runtime/Inquiry.cpp index 3e5f0037177f1c..0bda07aaef295c 100644 --- a/FortranRuntime/unittests/Runtime/Inquiry.cpp +++ b/flang-rt/unittests/Runtime/Inquiry.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/inquiry.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" diff --git a/FortranRuntime/unittests/Runtime/ListInputTest.cpp b/flang-rt/unittests/Runtime/ListInputTest.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/ListInputTest.cpp rename to flang-rt/unittests/Runtime/ListInputTest.cpp index e0fe4dfeac3949..7e04ab834eb247 100644 --- a/FortranRuntime/unittests/Runtime/ListInputTest.cpp +++ b/flang-rt/unittests/Runtime/ListInputTest.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" -#include "../../lib/Runtime/io-error.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" +#include "../../lib/flang_rt/io-error.h" using namespace Fortran::runtime; using namespace Fortran::runtime::io; diff --git a/FortranRuntime/unittests/Runtime/LogicalFormatTest.cpp b/flang-rt/unittests/Runtime/LogicalFormatTest.cpp similarity index 95% rename from FortranRuntime/unittests/Runtime/LogicalFormatTest.cpp rename to flang-rt/unittests/Runtime/LogicalFormatTest.cpp index 9fa0c2f4260edb..b5a9e2d317841f 100644 --- a/FortranRuntime/unittests/Runtime/LogicalFormatTest.cpp +++ b/flang-rt/unittests/Runtime/LogicalFormatTest.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include #include #include diff --git a/FortranRuntime/unittests/Runtime/Matmul.cpp b/flang-rt/unittests/Runtime/Matmul.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/Matmul.cpp rename to flang-rt/unittests/Runtime/Matmul.cpp index 6eb4012e785ff1..e833b3861badac 100644 --- a/FortranRuntime/unittests/Runtime/Matmul.cpp +++ b/flang-rt/unittests/Runtime/Matmul.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/matmul.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Runtime/allocatable.h" diff --git a/FortranRuntime/unittests/Runtime/MatmulTranspose.cpp b/flang-rt/unittests/Runtime/MatmulTranspose.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/MatmulTranspose.cpp rename to flang-rt/unittests/Runtime/MatmulTranspose.cpp index 199062f820c303..560f62935e35bc 100644 --- a/FortranRuntime/unittests/Runtime/MatmulTranspose.cpp +++ b/flang-rt/unittests/Runtime/MatmulTranspose.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Runtime/allocatable.h" diff --git a/FortranRuntime/unittests/Runtime/MiscIntrinsic.cpp b/flang-rt/unittests/Runtime/MiscIntrinsic.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/MiscIntrinsic.cpp rename to flang-rt/unittests/Runtime/MiscIntrinsic.cpp index 1033dda9d636f7..ca3a3e4fd3b839 100644 --- a/FortranRuntime/unittests/Runtime/MiscIntrinsic.cpp +++ b/flang-rt/unittests/Runtime/MiscIntrinsic.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Runtime/allocatable.h" diff --git a/FortranRuntime/unittests/Runtime/Namelist.cpp b/flang-rt/unittests/Runtime/Namelist.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/Namelist.cpp rename to flang-rt/unittests/Runtime/Namelist.cpp index 544ab85234fd65..d30625f23bfc1c 100644 --- a/FortranRuntime/unittests/Runtime/Namelist.cpp +++ b/flang-rt/unittests/Runtime/Namelist.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include "../../lib/Runtime/namelist.h" +#include "../../lib/flang_rt/namelist.h" #include "CrashHandlerFixture.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include "tools.h" #include #include diff --git a/FortranRuntime/unittests/Runtime/Numeric.cpp b/flang-rt/unittests/Runtime/Numeric.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/Numeric.cpp rename to flang-rt/unittests/Runtime/Numeric.cpp diff --git a/FortranRuntime/unittests/Runtime/NumericalFormatTest.cpp b/flang-rt/unittests/Runtime/NumericalFormatTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/NumericalFormatTest.cpp rename to flang-rt/unittests/Runtime/NumericalFormatTest.cpp index c588c739686bed..6c11bb0d4a49d6 100644 --- a/FortranRuntime/unittests/Runtime/NumericalFormatTest.cpp +++ b/flang-rt/unittests/Runtime/NumericalFormatTest.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/io-api-funcs.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/io-api-funcs.h" #include #include #include diff --git a/FortranRuntime/unittests/Runtime/Pointer.cpp b/flang-rt/unittests/Runtime/Pointer.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/Pointer.cpp rename to flang-rt/unittests/Runtime/Pointer.cpp index 733cd42232875f..c787ed9e71eee9 100644 --- a/FortranRuntime/unittests/Runtime/Pointer.cpp +++ b/flang-rt/unittests/Runtime/Pointer.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/pointer.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" #include "tools.h" diff --git a/FortranRuntime/unittests/Runtime/Ragged.cpp b/flang-rt/unittests/Runtime/Ragged.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/Ragged.cpp rename to flang-rt/unittests/Runtime/Ragged.cpp diff --git a/FortranRuntime/unittests/Runtime/Random.cpp b/flang-rt/unittests/Runtime/Random.cpp similarity index 95% rename from FortranRuntime/unittests/Runtime/Random.cpp rename to flang-rt/unittests/Runtime/Random.cpp index 81497a682660a8..bd4fcfd5e87975 100644 --- a/FortranRuntime/unittests/Runtime/Random.cpp +++ b/flang-rt/unittests/Runtime/Random.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/random.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include diff --git a/FortranRuntime/unittests/Runtime/Reduction.cpp b/flang-rt/unittests/Runtime/Reduction.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/Reduction.cpp rename to flang-rt/unittests/Runtime/Reduction.cpp index a382f4b7a71770..0f3789b017c6f6 100644 --- a/FortranRuntime/unittests/Runtime/Reduction.cpp +++ b/flang-rt/unittests/Runtime/Reduction.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/reduction.h" -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Common/float128.h" diff --git a/FortranRuntime/unittests/Runtime/RuntimeCrashTest.cpp b/flang-rt/unittests/Runtime/RuntimeCrashTest.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/RuntimeCrashTest.cpp rename to flang-rt/unittests/Runtime/RuntimeCrashTest.cpp index 7ce1ee796d739b..f1ea6c897d515e 100644 --- a/FortranRuntime/unittests/Runtime/RuntimeCrashTest.cpp +++ b/flang-rt/unittests/Runtime/RuntimeCrashTest.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "CrashHandlerFixture.h" #include "tools.h" -#include "../../lib/Runtime/terminator.h" +#include "../../lib/flang_rt/terminator.h" #include "flang/Runtime/io-api.h" #include "flang/Runtime/transformational.h" #include diff --git a/FortranRuntime/unittests/Runtime/Stop.cpp b/flang-rt/unittests/Runtime/Stop.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/Stop.cpp rename to flang-rt/unittests/Runtime/Stop.cpp index c12ec097068438..9aaabc2e6c6384 100644 --- a/FortranRuntime/unittests/Runtime/Stop.cpp +++ b/flang-rt/unittests/Runtime/Stop.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/stop.h" #include "CrashHandlerFixture.h" -#include "../../lib/Runtime/environment.h" +#include "../../lib/flang_rt/environment.h" #include #include diff --git a/FortranRuntime/unittests/Runtime/Support.cpp b/flang-rt/unittests/Runtime/Support.cpp similarity index 98% rename from FortranRuntime/unittests/Runtime/Support.cpp rename to flang-rt/unittests/Runtime/Support.cpp index 05328e6baa411c..d37369df025f45 100644 --- a/FortranRuntime/unittests/Runtime/Support.cpp +++ b/flang-rt/unittests/Runtime/Support.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/support.h" -#include "FortranRuntime/Runtime/descriptor.h" +#include "flang-rt/flang_rt/descriptor.h" #include "gtest/gtest.h" #include "tools.h" diff --git a/FortranRuntime/unittests/Runtime/TemporaryStack.cpp b/flang-rt/unittests/Runtime/TemporaryStack.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/TemporaryStack.cpp rename to flang-rt/unittests/Runtime/TemporaryStack.cpp index b0b1041f0f09e7..8a9f2dfe6d22f1 100644 --- a/FortranRuntime/unittests/Runtime/TemporaryStack.cpp +++ b/flang-rt/unittests/Runtime/TemporaryStack.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Common/ISO_Fortran_binding_wrapper.h" diff --git a/FortranRuntime/unittests/Runtime/Time.cpp b/flang-rt/unittests/Runtime/Time.cpp similarity index 100% rename from FortranRuntime/unittests/Runtime/Time.cpp rename to flang-rt/unittests/Runtime/Time.cpp diff --git a/FortranRuntime/unittests/Runtime/Transformational.cpp b/flang-rt/unittests/Runtime/Transformational.cpp similarity index 99% rename from FortranRuntime/unittests/Runtime/Transformational.cpp rename to flang-rt/unittests/Runtime/Transformational.cpp index 6b8903750d0aec..e8981e9b122eb7 100644 --- a/FortranRuntime/unittests/Runtime/Transformational.cpp +++ b/flang-rt/unittests/Runtime/Transformational.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "flang/Runtime/transformational.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "tools.h" #include "flang/Common/float128.h" diff --git a/FortranRuntime/unittests/Runtime/tools.h b/flang-rt/unittests/Runtime/tools.h similarity index 95% rename from FortranRuntime/unittests/Runtime/tools.h rename to flang-rt/unittests/Runtime/tools.h index 8000d83fc0c394..7edeff7f7eb579 100644 --- a/FortranRuntime/unittests/Runtime/tools.h +++ b/flang-rt/unittests/Runtime/tools.h @@ -9,8 +9,8 @@ #ifndef FORTRAN_UNITTESTS_RUNTIME_TOOLS_H_ #define FORTRAN_UNITTESTS_RUNTIME_TOOLS_H_ -#include "FortranRuntime/Runtime/descriptor.h" -#include "FortranRuntime/Runtime/type-code.h" +#include "flang-rt/flang_rt/descriptor.h" +#include "flang-rt/flang_rt/type-code.h" #include "gtest/gtest.h" #include "flang/Runtime/allocatable.h" #include "flang/Runtime/cpp-type.h" diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index 733a2ba1ed7ccc..455b6f597ff846 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -468,7 +468,7 @@ if (FLANG_CUF_RUNTIME) find_package(CUDAToolkit REQUIRED) endif() -add_subdirectory(../FortranRuntime/lib/Runtime runtime) +add_subdirectory(../flang-rt/lib/flang_rt runtime) if (LLVM_INCLUDE_EXAMPLES) add_subdirectory(examples) diff --git a/flang/include/flang/Common/README.md b/flang/include/flang/Common/README.md index a722732fb76407..4900caab478d94 100644 --- a/flang/include/flang/Common/README.md +++ b/flang/include/flang/Common/README.md @@ -2,7 +2,7 @@ Files in this directory are used by Flang (the compiler) and FortranRuntime (the runtime library for Flang-compiled programs). They must be compatible by both. For definitions used only by Flang, consider `flang/{lib,include/flang}/Support` instead. For definitions used only by -FortranRuntime, consider `FortranRuntime/{lib,include/FortranRuntime}/Runtime`. +the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`. The requirements for common code include: @@ -23,3 +23,5 @@ The requirements for common code include: * Global declarations may need to be annotated using definitions from `api-attrs.h`. + + * The `Runtime` component is header-only. diff --git a/flang/include/flang/ISO_Fortran_binding.h b/flang/include/flang/ISO_Fortran_binding.h index 89a10ce69a2ba2..b211bcd98af868 100644 --- a/flang/include/flang/ISO_Fortran_binding.h +++ b/flang/include/flang/ISO_Fortran_binding.h @@ -1,3 +1,11 @@ +//===-- include/flang/ISO_Fortran_binding.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. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + /*===-- include/flang/ISO_Fortran_binding.h -----------------------*- C++ -*-=== * * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. @@ -7,14 +15,14 @@ * ===-----------------------------------------------------------------------=== */ -#ifndef CFI_ISO_FORTRAN_BINDING_H_ -#define CFI_ISO_FORTRAN_BINDING_H_ +#ifndef FORTRAN_ISO_FORTRAN_BINDING_H_ +#define FORTRAN_ISO_FORTRAN_BINDING_H_ /* When this header is included into the compiler and runtime implementations, * it does so by means of a wrapper header that establishes namespaces and * a macro for extra function attributes (RT_API_ATTRS). */ -#ifndef FORTRAN_ISO_FORTRAN_BINDING_WRAPPER_H_ +#ifndef FORTRAN_COMMON_ISO_FORTRAN_BINDING_WRAPPER_H_ #include #define FORTRAN_ISO_NAMESPACE_ #endif @@ -207,4 +215,4 @@ RT_API_ATTRS int CFI_setpointer( } // extern "C" #endif -#endif /* CFI_ISO_FORTRAN_BINDING_H_ */ +#endif /* FORTRAN_ISO_FORTRAN_BINDING_H_ */ diff --git a/flang/include/flang/Runtime/README.md b/flang/include/flang/Runtime/README.md index a13a7e23162e98..4900caab478d94 100644 --- a/flang/include/flang/Runtime/README.md +++ b/flang/include/flang/Runtime/README.md @@ -2,7 +2,7 @@ Files in this directory are used by Flang (the compiler) and FortranRuntime (the runtime library for Flang-compiled programs). They must be compatible by both. For definitions used only by Flang, consider `flang/{lib,include/flang}/Support` instead. For definitions used only by -FortranRuntime, consider `FortranRuntime/{lib,include/FortranRuntime}/Runtime`. +the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`. The requirements for common code include: diff --git a/flang/include/flang/Testing/README.md b/flang/include/flang/Testing/README.md index a722732fb76407..4900caab478d94 100644 --- a/flang/include/flang/Testing/README.md +++ b/flang/include/flang/Testing/README.md @@ -2,7 +2,7 @@ Files in this directory are used by Flang (the compiler) and FortranRuntime (the runtime library for Flang-compiled programs). They must be compatible by both. For definitions used only by Flang, consider `flang/{lib,include/flang}/Support` instead. For definitions used only by -FortranRuntime, consider `FortranRuntime/{lib,include/FortranRuntime}/Runtime`. +the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`. The requirements for common code include: @@ -23,3 +23,5 @@ The requirements for common code include: * Global declarations may need to be annotated using definitions from `api-attrs.h`. + + * The `Runtime` component is header-only. diff --git a/flang/lib/Common/README.md b/flang/lib/Common/README.md index a722732fb76407..4900caab478d94 100644 --- a/flang/lib/Common/README.md +++ b/flang/lib/Common/README.md @@ -2,7 +2,7 @@ Files in this directory are used by Flang (the compiler) and FortranRuntime (the runtime library for Flang-compiled programs). They must be compatible by both. For definitions used only by Flang, consider `flang/{lib,include/flang}/Support` instead. For definitions used only by -FortranRuntime, consider `FortranRuntime/{lib,include/FortranRuntime}/Runtime`. +the runtime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`. The requirements for common code include: @@ -23,3 +23,5 @@ The requirements for common code include: * Global declarations may need to be annotated using definitions from `api-attrs.h`. + + * The `Runtime` component is header-only. diff --git a/flang/lib/Optimizer/Transforms/CufOpConversion.cpp b/flang/lib/Optimizer/Transforms/CufOpConversion.cpp index d7d321c6b9af3f..68ce3ab7045505 100644 --- a/flang/lib/Optimizer/Transforms/CufOpConversion.cpp +++ b/flang/lib/Optimizer/Transforms/CufOpConversion.cpp @@ -1,4 +1,4 @@ -//===-- CufOpConversion.cpp -----------------------------------------------===// +//===-- lib/Optimizer/Transforms/CufOpConversion.cpp ------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/flang/lib/Testing/README.md b/flang/lib/Testing/README.md index a722732fb76407..256195b0a1916d 100644 --- a/flang/lib/Testing/README.md +++ b/flang/lib/Testing/README.md @@ -2,7 +2,7 @@ Files in this directory are used by Flang (the compiler) and FortranRuntime (the runtime library for Flang-compiled programs). They must be compatible by both. For definitions used only by Flang, consider `flang/{lib,include/flang}/Support` instead. For definitions used only by -FortranRuntime, consider `FortranRuntime/{lib,include/FortranRuntime}/Runtime`. +FortranRuntime, consider `flang-rt/{lib,include/flang-rt}/flang_rt`. The requirements for common code include: diff --git a/flang/unittests/CMakeLists.txt b/flang/unittests/CMakeLists.txt index a3fed6c27d125b..4a279c9bbf3260 100644 --- a/flang/unittests/CMakeLists.txt +++ b/flang/unittests/CMakeLists.txt @@ -10,7 +10,7 @@ endif() add_custom_target(FlangUnitTests) set_target_properties(FlangUnitTests PROPERTIES FOLDER "Flang/Tests") -include_directories("../../FortranRuntime/include") +include_directories("../../flang-rt/include") function(add_flang_unittest_offload_properties target) # Set CUDA_RESOLVE_DEVICE_SYMBOLS. @@ -77,5 +77,5 @@ add_subdirectory(Optimizer) add_subdirectory(Common) add_subdirectory(Decimal) add_subdirectory(Evaluate) -add_subdirectory(../../FortranRuntime/unittests/Runtime Runtime) +add_subdirectory(../../flang-rt/unittests/Runtime Runtime) add_subdirectory(Frontend) diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt index 5694f5a144c4c5..8557b68991dfe4 100644 --- a/flang/unittests/Evaluate/CMakeLists.txt +++ b/flang/unittests/Evaluate/CMakeLists.txt @@ -76,4 +76,4 @@ add_flang_nongtest_unittest(folding FortranSemantics ) -add_subdirectory(../../../FortranRuntime/unittests/Evaluate runtime) +add_subdirectory(../../../flang-rt/unittests/Evaluate runtime)