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

Author: Meinersbur

flang-rt/lib/flang_rt/CMakeLists.txt

@@ -15,6 +15,8 @@ set(BACKTRACE_HEADER ${Backtrace_HEADER})
 
 # List of files that are buildable for all devices.
 set(supported_sources
+  ${FLANG_SOURCE_DIR}/lib/Common/binary-to-decimal.cpp
+  ${FLANG_SOURCE_DIR}/lib/Common/decimal-to-binary.cpp
   ISO_Fortran_binding.cpp
   allocator-registry.cpp
   allocatable.cpp

flang-rt/test/Runtime/no-cpp-dep.c

@@ -8,6 +8,7 @@ UNSUPPORTED: system-windows
 RUN: %if system-aix %{ export OBJECT_MODE=64 %}
 RUN: %cc -std=c99 %s -I%include -L"%libdir" -lflang_rt -lm %deplibs \
 RUN: %if system-aix %{-lpthread %}
+RUN: rm a.out
 */
 
 #include "flang/Runtime/entry-names.h"

flang-rt/unittests/Runtime/CUDA/CMakeLists.txt

@@ -7,12 +7,21 @@
 #===------------------------------------------------------------------------===#
 
 add_flangrt_unittest(FlangCufRuntimeTests
+  Allocatable.cpp
   Allocatable.cpp
   AllocatorCUF.cpp
+  Memory.cpp
 )
 
+if (BUILD_SHARED_LIBS)
+  set(CUDA_RT_TARGET CUDA::cudart)
+else()
+  set(CUDA_RT_TARGET CUDA::cudart_static)
+endif()
+
 target_link_libraries(FlangCufRuntimeTests
   PRIVATE
+  ${CUDA_RT_TARGET}
   CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}
   flang_rt
 )

flang/unittests/Runtime/CUDA/Memory.cpp renamed to flang-rt/unittests/Runtime/CUDA/Memory.cpp

@@ -7,15 +7,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/CUDA/memory.h"
+#include "flang-rt/CUDA/allocator.h"
+#include "flang-rt/allocator-registry.h"
 #include "gtest/gtest.h"
-#include "../../../runtime/terminator.h"
+#include "../../../lib/flang_rt/terminator.h"
 #include "../tools.h"
-#include "flang/Common/Fortran.h"
-#include "flang/Runtime/CUDA/allocator.h"
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
-#include "flang/Runtime/allocator-registry.h"
+#include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"
 

flang/include/flang/Common/ISO_Fortran_binding_wrapper.h

@@ -22,7 +22,7 @@
 
 /* clang-format off */
 #include <stddef.h>
-#include "flang/Common/api-attrs.h"  
+#include "flang/Common/api-attrs.h"
 #ifdef __cplusplus
 namespace Fortran {
 namespace ISO {

flang/include/flang/Parser/message.h

@@ -15,9 +15,9 @@
 #include "char-block.h"
 #include "char-set.h"
 #include "provenance.h"
-#include "flang/Support/Fortran-features.h"
 #include "flang/Common/idioms.h"
 #include "flang/Common/restorer.h"
+#include "flang/Support/Fortran-features.h"
 #include "flang/Support/reference-counted.h"
 #include <cstddef>
 #include <cstring>

flang/lib/Frontend/CMakeLists.txt

@@ -28,6 +28,7 @@ add_flang_library(flangFrontend
   FortranSemantics
   FortranEvaluate
   FortranSupport
+  FortranSupport
   FortranLower
   FIRDialect
   FIRDialectSupport

flang/lib/Lower/CMakeLists.txt

@@ -57,6 +57,7 @@ add_flang_library(FortranLower
   ${dialect_libs}
   ${extension_libs}
   FortranSupport
+  FortranSupport
   FortranParser
   FortranEvaluate
   FortranSemantics

flang/lib/Optimizer/Transforms/CMakeLists.txt

@@ -47,6 +47,7 @@ add_flang_library(FIRTransforms
   FIRDialectSupport
   FIRSupport
   FortranSupport
+  FortranSupport
   HLFIRDialect
   MLIRAffineUtils
   MLIRFuncDialect

flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp

@@ -11,6 +11,7 @@
 #include "flang/Optimizer/Dialect/FIROpsSupport.h"
 #include "flang/Optimizer/Support/InternalNames.h"
 #include "flang/Optimizer/Transforms/Passes.h"
+#include "flang/Support/Fortran.h"
 #include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "flang/Support/Fortran.h"
 #include "mlir/IR/Attributes.h"