build fixes

Meinersbur · Meinersbur · commit f97c774ef208 · 2025-02-03T23:12:11.000+01:00
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -1330,7 +1330,7 @@ void tools::addFortranRuntimeLibs(const ToolChain &TC, const ArgList &Args,
     F128LibName.consume_front_insensitive("lib");
     if (!F128LibName.empty()) {
       bool AsNeeded = !TC.getTriple().isOSAIX();
-      CmdArgs.push_back("-lFortranFloat128Math");
+      CmdArgs.push_back("-lflang_rt.quadmath");
       if (AsNeeded)
         addAsNeededOption(TC, Args, CmdArgs, /*as_needed=*/true);
       CmdArgs.push_back(Args.MakeArgString("-l" + F128LibName));
diff --git a/flang-rt/cmake/modules/AddFlangRT.cmake b/flang-rt/cmake/modules/AddFlangRT.cmake
@@ -6,7 +6,7 @@
 #
 #===------------------------------------------------------------------------===#
 
-# Builds a library with common options for flang-rt.
+# Builds a library with common options for Flang-RT.
 #
 # Usage:
 #
@@ -108,11 +108,11 @@ function (add_flangrt_library name)
   endif ()
 
   # Flang-RT's public headers
-  target_include_directories(${name} PRIVATE "${FLANG_RT_SOURCE_DIR}/include")
+  target_include_directories(${name} PUBLIC "${FLANG_RT_SOURCE_DIR}/include")
 
   # For ISO_Fortran_binding.h to be found by the runtime itself (Accessed as #include "flang/ISO_Fortran_binding.h")
   # User applications can use #include <ISO_Fortran_binding.h>
-  target_include_directories(${name} PRIVATE "${FLANG_SOURCE_DIR}/include")
+  target_include_directories(${name} PUBLIC "${FLANG_SOURCE_DIR}/include")
 
   # For Flang-RT's configured config.h to be found
   target_include_directories(${name} PRIVATE "${FLANG_RT_BINARY_DIR}")
diff --git a/flang-rt/cmake/modules/AddFlangRTOffload.cmake b/flang-rt/cmake/modules/AddFlangRTOffload.cmake
@@ -34,8 +34,7 @@ macro(enable_cuda_compilation name files)
         )
     endif()
     set_source_files_properties(${files} PROPERTIES COMPILE_OPTIONS
-      "${CUDA_COMPILE_OPTIONS}"
-      )
+      "${CUDA_COMPILE_OPTIONS}")
 
     # Create a .a library consisting of CUDA PTX.
     # This is different from a regular static library. The CUDA_PTX_COMPILATION
diff --git a/flang-rt/examples/ExternalHelloWorld/CMakeLists.txt b/flang-rt/examples/ExternalHelloWorld/CMakeLists.txt
@@ -13,5 +13,5 @@ add_llvm_example(external-hello-world
 
 target_link_libraries(external-hello-world
   PRIVATE
-  flang_rt.runtime
+    flang_rt.runtime
   )
diff --git a/flang-rt/include/flang-rt/runtime/tools.h b/flang-rt/include/flang-rt/runtime/tools.h
@@ -348,7 +348,7 @@ inline RT_API_ATTRS RESULT ApplyFloatingPointKind(
     if constexpr (HasCppTypeFor<TypeCategory::Real, 16>) {
       // If FUNC implemenation relies on FP math functions,
       // then we should not be here. The compiler should have
-      // generated a call to an entry in FortranFloat128Math
+      // generated a call to an entry in the libflang_rt.quadmath
       // library.
       if constexpr (!NEEDSMATH) {
         return FUNC<16>{}(std::forward<A>(x)...);
diff --git a/flang-rt/lib/quadmath/CMakeLists.txt b/flang-rt/lib/quadmath/CMakeLists.txt
@@ -12,7 +12,7 @@
 # It is distributed as a static library only.
 # Fortran programs/libraries that end up linking any of the provided
 # will have a dependency on the third-party library that is being
-# used for building this FortranFloat128Math library.
+# used for building this libflang_rt.quadmath library.
 
 include(CheckLibraryExists)
 include(CheckIncludeFile)
@@ -95,7 +95,7 @@ if (FLANG_RUNTIME_F128_MATH_LIB)
   endif()
 
   if (WIN32)
-    # Do not create a FortranFloat128Math library under Windows, the Flang
+    # Do not create a flang_rt.quadmath library under Windows, the Flang
     # driver never links it. Instead, add the sources to flang_rt.runtime.
     target_sources(FortranFloat128MathILib INTERFACE ${sources})
     target_compile_definitions(FortranFloat128MathILib INTERFACE HAS_QUADMATHLIB)
diff --git a/flang-rt/lib/quadmath/complex-math.c b/flang-rt/lib/quadmath/complex-math.c
@@ -1,4 +1,4 @@
-/*===-- lib/FortranFloat128Math/complex-math.c ----------------------*- C -*-===
+/*===-- lib/quadmath/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/flang-rt/lib/quadmath/complex-math.h b/flang-rt/lib/quadmath/complex-math.h
@@ -59,4 +59,4 @@
 #error "Float128Math build with glibc>=2.26 is unsupported yet"
 #endif
 
-#endif // FLANG_RT_QUADMATH_COMPLEX_MATH_H_
+#endif /* FLANG_RT_QUADMATH_COMPLEX_MATH_H_ */
diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
@@ -99,7 +99,7 @@ file(GLOB_RECURSE private_headers
   )
 
 
-# Import changes from sibling FortranFloat128Math
+# Import changes from flang_rt.quadmath
 get_target_property(f128_sources
   FortranFloat128MathILib INTERFACE_SOURCES
   )
@@ -170,7 +170,7 @@ else()
 
     enable_cuda_compilation(${name} "${supported_sources}")
     enable_omp_offload_compilation(${name} "${supported_sources}")
-    add_dependencies(flang_rt ${name})
+    add_dependencies(flang_rt.runtime ${name})
   endfunction ()
 
   # Variants of the static flang_rt for different versions of the msvc runtime.
diff --git a/flang-rt/test/Runtime/no-cpp-dep.c b/flang-rt/test/Runtime/no-cpp-dep.c
@@ -1,13 +1,13 @@
 /*
 This test makes sure that flang's runtime does not depend on the C++ runtime
-library. It tries to link this simple file against libflang_rt.a with
+library. It tries to link this simple file against libflang_rt.runtime.a with
 a C compiler.
 
 UNSUPPORTED: system-windows
 UNSUPPORTED: offload-cuda
 
 RUN: %if system-aix %{ export OBJECT_MODE=64 %}
-RUN: %cc -std=c99 %s -I%include -L"%libdir" -lflang_rt -lm \
+RUN: %cc -std=c99 %s -I%include -L"%libdir" -lflang_rt.runtime -lm \
 RUN: %if system-aix %{-lpthread %}
 RUN: rm a.out
 */
diff --git a/flang-rt/unittests/CMakeLists.txt b/flang-rt/unittests/CMakeLists.txt
@@ -64,8 +64,6 @@ function(add_flangrt_unittest test_dirname)
 
   add_unittest(FlangRTUnitTests ${test_dirname} ${ARG_UNPARSED_ARGUMENTS})
 
-  target_include_directories(${test_dirname} PRIVATE "${FLANG_RT_SOURCE_DIR}/include")
-  target_include_directories(${test_dirname} PRIVATE "${FLANG_SOURCE_DIR}/include")
   target_link_libraries(${test_dirname} PRIVATE ${ARG_LINK_LIBS})
   add_flangrt_unittest_offload_properties(${test_dirname})
 
@@ -94,10 +92,6 @@ function(add_flangrt_nongtest_unittest test_name)
   add_executable(${test_name}${suffix} EXCLUDE_FROM_ALL ${ARG_UNPARSED_ARGUMENTS})
   set_target_properties(${test_name}${suffix} PROPERTIES FOLDER "Flang-RT/Tests/Unit")
 
-  target_include_directories(${test_name}${suffix} PRIVATE
-      "${FLANG_RT_SOURCE_DIR}/include"
-      "${FLANG_SOURCE_DIR}/include"
-    )
   target_link_libraries(${test_name}${suffix} PRIVATE NonGTestTesting ${ARG_LINK_LIBS})
 
   if(NOT ARG_SLOW_TEST)
diff --git a/flang-rt/unittests/Evaluate/CMakeLists.txt b/flang-rt/unittests/Evaluate/CMakeLists.txt
@@ -10,12 +10,12 @@ add_flangrt_nongtest_unittest(reshape
   reshape.cpp
 
   LINK_LIBS
-    flang_rt.unittest
+    flang_rt.runtime.unittest
 )
 
 add_flangrt_nongtest_unittest(ISO-Fortran-binding
   ISO-Fortran-binding.cpp
 
   LINK_LIBS
-    flang_rt.unittest
+    flang_rt.runtime.unittest
 )
diff --git a/flang-rt/unittests/Runtime/CMakeLists.txt b/flang-rt/unittests/Runtime/CMakeLists.txt
@@ -39,7 +39,7 @@ add_flangrt_unittest(RuntimeTests
   Transformational.cpp
 
   LINK_LIBS
-    flang_rt.unittest
+    flang_rt.runtime.unittest
 )
 target_compile_definitions(RuntimeTests PRIVATE NOT_EXE="${LLVM_TOOLS_DIR}/not${CMAKE_EXECUTABLE_SUFFIX}")
 
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
@@ -57,7 +57,7 @@ function(add_flang_library name)
     set(LIBTYPE SHARED)
   elseif(ARG_STATIC)
     # If BUILD_SHARED_LIBS and ARG_STATIC are both set, llvm_add_library prioritizes STATIC.
-    # This is required behavior for libFortranFloat128Math.
+    # This is required behavior for libflang_rt.quadmath.
     set(LIBTYPE STATIC)
   else()
     # Let llvm_add_library decide, taking BUILD_SHARED_LIBS into account.
diff --git a/flang/docs/GettingStarted.md b/flang/docs/GettingStarted.md
@@ -317,7 +317,7 @@ The same set of CMake variables works for Flang in-tree build.
 One may provide optional CMake variables to customize the build. Available options:
 
 * `-DFLANG_RUNTIME_F128_MATH_LIB=libquadmath`: enables build of
-  `FortranFloat128Math` library that provides `REAL(16)` math APIs
+  `flang_rt.quadmath` library that provides `REAL(16)` math APIs
   for intrinsics such as `SIN`, `COS`, etc. GCC `libquadmath`'s header file
   `quadmath.h` must be available to the build compiler.
   [More details](Real16MathSupport.md).
diff --git a/flang/docs/Real16MathSupport.md b/flang/docs/Real16MathSupport.md
@@ -12,9 +12,9 @@ To support most `REAL(16)` (i.e. 128-bit float) math intrinsics Flang relies
 on third-party libraries providing the implementation.
 
 `-DFLANG_RUNTIME_F128_MATH_LIB=libquadmath` CMake option can be used
-to build `FortranFloat128Math` library that has unresolved references
+to build `libflang_rt.quadmath` library that has unresolved references
 to GCC `libquadmath` library. A Flang driver built with this option
-will automatically link `FortranFloat128Math` and `libquadmath` libraries
+will automatically link `libflang_rt.quadmath` and `libquadmath` libraries
 to any Fortran program. This implies that `libquadmath` library
 has to be available in the standard library paths, so that linker
 can find it. The `libquadmath` library installation into Flang project
diff --git a/flang/docs/ReleaseNotes.md b/flang/docs/ReleaseNotes.md
@@ -36,13 +36,18 @@ page](https://llvm.org/releases/).
 
 ## Build System Changes
 
+ * The FortranRuntime library has been renamed to `flang_rt.runtime`.
+
+ * The FortranFloat128Math library has been renamed to `flang_rt.quadmath`.
+
+ * The CufRuntime_cuda_${version} library has been renamed to
+   `flang_rt.cuda_${version}`.
+
  * The Fortran Runtime library has been move to a new top-level directory
-   named "flang-rt". The library was also renamed from `FortranRuntime` to
-   `flang_rt.runtime`. It now supports the
-   LLVM_ENABLE_RUNTIMES mechanism to build Flang-RT for multiple target
-   triples. libflang_rt.runtime.a will now be emitted into Clang's per-target
-   resource directory (next to libclang_rt.*.*) where it is also found by
-   Flang's driver.
+   named "flang-rt". It now supports the LLVM_ENABLE_RUNTIMES mechanism to
+   build Flang-RT for multiple target triples. libflang_rt.runtime.{a|so} will
+   now be emitted into Clang's per-target resource directory
+   (next to libclang_rt.*.*) where it is also found by Flang's driver.
 
 ## New Issues Found
 
diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
@@ -808,8 +808,8 @@ prettyPrintIntrinsicName(fir::FirOpBuilder &builder, mlir::Location loc,
 // Generate a call to the Fortran runtime library providing
 // support for 128-bit float math.
 // On 'HAS_LDBL128' targets the implementation
-// is provided by flang_rt, otherwise, it is done via
-// FortranFloat128Math library. In the latter case the compiler
+// is provided by flang_rt, otherwise, it is done via the
+// libflang_rt.quadmath library. In the latter case the compiler
 // has to be built with FLANG_RUNTIME_F128_MATH_LIB to guarantee
 // proper linking actions in the driver.
 static mlir::Value genLibF128Call(fir::FirOpBuilder &builder,
diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt
@@ -259,14 +259,14 @@ set(supported_files
   unit.cpp
   utf.cpp
   )
-
 runtime_source_files(supported_files SUBDIR "runtime")
+
 enable_cuda_compilation(flang_rt "${supported_files}")
 enable_omp_offload_compilation("${supported_files}")
 
-if (NOT TARGET FortranFloat128Math)
-  # If FortranFloat128Math is not defined, then we are not building
-  # standalone FortranFloat128Math library. Instead, include
+if (NOT TARGET flang_rt.quadmath)
+  # If flang_rt.quadmath is not defined, then we are not building
+  # standalone flang_rt.quadmath library. Instead, include
   # the relevant sources into flang_rt itself.
   # The information is provided via FortranFloat128MathILib
   # interface library.
@@ -293,7 +293,6 @@ if (NOT TARGET FortranFloat128Math)
     list(APPEND sources ${f128_sources})
   endif()
 endif()
-
 runtime_source_files(sources SUBDIR "runtime")
 
 
@@ -349,5 +348,11 @@ endif()
 # Compatibility targets.
 add_custom_target(flang-rt)
 add_dependencies(flang-rt flang_rt.runtime)
+if (TARGET flang_rt.quadmath)
+  add_dependencies(flang-rt flang_rt.quadmath)
+endif ()
+if (TARGET flang_rt.cuda_${CUDAToolkit_VERSION_MAJOR})
+  add_dependencies(flang-rt flang_rt.cuda_${CUDAToolkit_VERSION_MAJOR})
+endif ()
 add_custom_target(FortranRuntime)
 add_dependencies(FortranRuntime flang_rt.runtime)
diff --git a/flang/runtime/Float128Math/CMakeLists.txt b/flang/runtime/Float128Math/CMakeLists.txt
diff --git a/flang/test/Driver/linker-flags.f90 b/flang/test/Driver/linker-flags.f90

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`#===------------------------------------------------------------------------===#`
`8`	`8`
`9`		`-# Builds a library with common options for flang-rt.`
	`9`	`+# Builds a library with common options for Flang-RT.`
`10`	`10`	`#`
`11`	`11`	`# Usage:`
`12`	`12`	`#`
`@@ -108,11 +108,11 @@ function (add_flangrt_library name)`
`108`	`108`	`endif ()`
`109`	`109`
`110`	`110`	`# Flang-RT's public headers`
`111`		`- target_include_directories(${name} PRIVATE "${FLANG_RT_SOURCE_DIR}/include")`
	`111`	`+ target_include_directories(${name} PUBLIC "${FLANG_RT_SOURCE_DIR}/include")`
`112`	`112`
`113`	`113`	`# For ISO_Fortran_binding.h to be found by the runtime itself (Accessed as #include "flang/ISO_Fortran_binding.h")`
`114`	`114`	`# User applications can use #include <ISO_Fortran_binding.h>`
`115`		`- target_include_directories(${name} PRIVATE "${FLANG_SOURCE_DIR}/include")`
	`115`	`+ target_include_directories(${name} PUBLIC "${FLANG_SOURCE_DIR}/include")`
`116`	`116`
`117`	`117`	`# For Flang-RT's configured config.h to be found`
`118`	`118`	`target_include_directories(${name} PRIVATE "${FLANG_RT_BINARY_DIR}")`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ macro(enable_cuda_compilation name files)`
`34`	`34`	`)`
`35`	`35`	`endif()`
`36`	`36`	`set_source_files_properties(${files} PROPERTIES COMPILE_OPTIONS`
`37`		`- "${CUDA_COMPILE_OPTIONS}"`
`38`		`- )`
	`37`	`+ "${CUDA_COMPILE_OPTIONS}")`
`39`	`38`
`40`	`39`	`# Create a .a library consisting of CUDA PTX.`
`41`	`40`	`# This is different from a regular static library. The CUDA_PTX_COMPILATION`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ add_llvm_example(external-hello-world`
`13`	`13`
`14`	`14`	`target_link_libraries(external-hello-world`
`15`	`15`	`PRIVATE`
`16`		`- flang_rt.runtime`
	`16`	`+ flang_rt.runtime`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/===-- lib/FortranFloat128Math/complex-math.c ----------------------- C -*-===`
	`1`	`+/===-- lib/quadmath/complex-math.c ---------------------------------- C -*-===`
`2`	`2`	`*`
`3`	`3`	`* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.`
`4`	`4`	`* See https://llvm.org/LICENSE.txt for license information.`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ file(GLOB_RECURSE private_headers`
`99`	`99`	`)`
`100`	`100`
`101`	`101`
`102`		`-# Import changes from sibling FortranFloat128Math`
	`102`	`+# Import changes from flang_rt.quadmath`
`103`	`103`	`get_target_property(f128_sources`
`104`	`104`	`FortranFloat128MathILib INTERFACE_SOURCES`
`105`	`105`	`)`
`@@ -170,7 +170,7 @@ else()`
`170`	`170`
`171`	`171`	`enable_cuda_compilation(${name} "${supported_sources}")`
`172`	`172`	`enable_omp_offload_compilation(${name} "${supported_sources}")`
`173`		`- add_dependencies(flang_rt ${name})`
	`173`	`+ add_dependencies(flang_rt.runtime ${name})`
`174`	`174`	`endfunction ()`
`175`	`175`
`176`	`176`	`# Variants of the static flang_rt for different versions of the msvc runtime.`