[compiler-rt] Removes CMake work-arounds.

[Mordante]

Summary

CMake older than 3.20.0 is no longer supported.
This removes work-arounds for no longer supported versions.

[phosek]

LGTM

[h-vetinari]

In compiler-rt there's still a work-around marked TODO(dliew) here

[Mordante]

In D152102#4397687, @h-vetinari wrote:

In compiler-rt there's still a work-around marked TODO(dliew) here

I feel changing this is out of scope. I agree it would be nice to fix this, but I will not pursue it. Feel free to provide patches for these improvements.

[paulkirth]

I think maybe some path for Mac got missed. We're seeing the following CMake error in our CI:

-- Got ld supported ARCHES: armv6 armv7 armv7s arm64 arm64e arm64_32 i386 x86_64 x86_64h armv6m armv7k armv7m armv7em
-- Toolchain supported arches: armv6;armv7;armv7s;arm64;arm64e;arm64_32;i386;x86_64;x86_64h;armv6m;armv7k;armv7m;armv7em
-- Using cached valid architectures for osx.
-- OSX supported arches: arm64;x86_64
-- Compiler-RT supported architectures: arm64;x86_64
CMake Error at /opt/s/w/ir/x/w/llvm-llvm-project/compiler-rt/lib/xray/CMakeLists.txt:174 (add_asm_sources):
  Unknown CMake command "add_asm_sources".


-- Configuring incomplete, errors occurred!

you can find the bot here: https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-mac-xarm64/b8778931818655578401/overview

[Mordante]

In D152102#4404005, @paulkirth wrote:

I think maybe some path for Mac got missed. We're seeing the following CMake error in our CI:

-- Got ld supported ARCHES: armv6 armv7 armv7s arm64 arm64e arm64_32 i386 x86_64 x86_64h armv6m armv7k armv7m armv7em
-- Toolchain supported arches: armv6;armv7;armv7s;arm64;arm64e;arm64_32;i386;x86_64;x86_64h;armv6m;armv7k;armv7m;armv7em
-- Using cached valid architectures for osx.
-- OSX supported arches: arm64;x86_64
-- Compiler-RT supported architectures: arm64;x86_64
CMake Error at /opt/s/w/ir/x/w/llvm-llvm-project/compiler-rt/lib/xray/CMakeLists.txt:174 (add_asm_sources):
  Unknown CMake command "add_asm_sources".


-- Configuring incomplete, errors occurred!

you can find the bot here: https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-mac-xarm64/b8778931818655578401/overview

Thanks! I just pushed a fix.

compiler-rt/cmake/Modules/AddCompilerRT.cmake

function(add_compiler_rt_component name)
   add_custom_target(${name})
   set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc")
   if(COMMAND runtime_register_component)
     runtime_register_component(${name})
   endif()
   add_dependencies(compiler-rt ${name})
 endfunction()
 
-function(add_asm_sources output)
-  set(${output} ${ARGN} PARENT_SCOPE)
-  # CMake doesn't pass the correct architecture for Apple prior to CMake 3.19. https://gitlab.kitware.com/cmake/cmake/-/issues/20771
-  # MinGW didn't work correctly with assembly prior to CMake 3.17. https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4287 and https://reviews.llvm.org/rGb780df052dd2b246a760d00e00f7de9ebdab9d09
-  # Workaround these two issues by compiling as C.
-  # Same workaround used in libunwind. Also update there if changed here.
-  if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
-    set_source_files_properties(${ARGN} PROPERTIES LANGUAGE C)
-  endif()
-endfunction()
-
 macro(set_output_name output name arch)
   if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
     set(${output} ${name})
   else()
     if(ANDROID AND ${arch} STREQUAL "i386")
       set(${output} "${name}-i686${COMPILER_RT_OS_SUFFIX}")
     elseif("${arch}" MATCHES "^arm")
       if(COMPILER_RT_DEFAULT_TARGET_ONLY)

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

 include(CMakeParseArguments)
 include(CompilerRTUtils)
 
 function(get_aix_libatomic_default_link_flags link_flags export_list)
 set(linkopts
   -Wl,-H512 -Wl,-D0
   -Wl,-T512 -Wl,-bhalt:4 -Wl,-bernotok
   -Wl,-bnoentry -Wl,-bexport:${export_list}
   -Wl,-bmodtype:SRE -Wl,-lc)
   # Add `-Wl,-G`. Quoted from release notes of cmake-3.16.0
   # > On AIX, runtime linking is no longer enabled by default.
   # See https://cmake.org/cmake/help/latest/release/3.16.html
-  if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-    set(linkopts -Wl,-G ${linkopts})
-  endif()
   set(${link_flags} ${linkopts} PARENT_SCOPE)
 endfunction()
 
 function(get_aix_libatomic_type type)
-  if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
-    set(${type} SHARED PARENT_SCOPE)
-  else()
-    set(${type} MODULE PARENT_SCOPE)
-  endif()
 endfunction()
 
 macro(archive_aix_libatomic name libname)
   cmake_parse_arguments(LIB
     ""
     ""
     "ARCHS;PARENT_TARGET"
     ${ARGN})

compiler-rt/lib/orc/CMakeLists.txt

 add_compiler_rt_component(orc)
 
 # ORC uses C++ standard library headers.
 if (TARGET cxx-headers OR HAVE_LIBCXX)
   set(ORC_DEPS cxx-headers)
 endif()
 
 if (APPLE)
-  add_asm_sources(ORC_ASM_SOURCES
+  set(ORC_ASM_SOURCES
     macho_tlv.x86-64.S
     macho_tlv.arm64.S
     )
 
   set(ORC_IMPL_HEADERS
     ${ORC_COMMON_IMPL_HEADERS}
     macho_platform.h
     )
set(ORC_IMPL_HEADERS
       elfnix_platform.h
       )
 
     set(ORC_SOURCES
       ${ORC_COMMON_SOURCES}
       elfnix_platform.cpp
       )
 
-    add_asm_sources(ORC_ASM_SOURCES
+    set(ORC_ASM_SOURCES
       elfnix_tls.x86-64.S
       elfnix_tls.aarch64.S
       )
   endif()
 
   foreach(arch ${ORC_SUPPORTED_ARCH})
     if(NOT CAN_TARGET_${arch})
       continue()

compiler-rt/lib/tsan/rtl/CMakeLists.txt

if(APPLE)
   # Ideally we would check the SDK version for the actual platform we are
   # building for here.  To make our lifes easier we assume the host SDK setup is
   # sane and use the macOS SDK version as a proxy for aligned SDKs.
   find_darwin_sdk_version(macosx_sdk_version "macosx")
   if ("${macosx_sdk_version}" VERSION_LESS 10.12)
     message(FATAL_ERROR "Building the TSan runtime requires at least macOS SDK 10.12 (or aligned SDK on other platforms)")
   endif()
 
-  add_asm_sources(TSAN_ASM_SOURCES
+  set(TSAN_ASM_SOURCES
     tsan_rtl_amd64.S
     tsan_rtl_aarch64.S
     )
 
   set(TSAN_LINK_LIBS ${SANITIZER_COMMON_LINK_LIBS})
 
   add_weak_symbols("ubsan" WEAK_SYMBOL_LINK_FLAGS)
   add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
add_custom_target(GotsanRuntimeCheck
     DEPENDS tsan ${BUILDGO_SCRIPT}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go
     COMMENT "Checking TSan Go runtime..."
     VERBATIM)
   set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc")
 else()
   foreach(arch ${TSAN_SUPPORTED_ARCH})
     if(arch STREQUAL "x86_64")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_amd64.S
         )
       # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
         COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
                 EXTRA_CFLAGS=${EXTRA_CFLAGS}
                 IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
         DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go
         COMMENT "Checking TSan Go runtime..."
         VERBATIM)
     elseif(arch STREQUAL "aarch64")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_aarch64.S
         )
       # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
   COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
     EXTRA_CFLAGS=${EXTRA_CFLAGS}
     IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
   DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go
   COMMENT "Checking TSan Go runtime..."
   VERBATIM)
     elseif(arch MATCHES "powerpc64|powerpc64le")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_ppc64.S
         )
       # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
   COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
     EXTRA_CFLAGS=${EXTRA_CFLAGS}
     IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}
   DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go
   COMMENT "Checking TSan Go runtime..."
   VERBATIM)
     elseif(arch MATCHES "loongarch64")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_loongarch64.S
         )
     elseif(arch MATCHES "mips64|mips64le")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_mips64.S
         )
     elseif(arch MATCHES "s390x")
-      add_asm_sources(TSAN_ASM_SOURCES
+      set(TSAN_ASM_SOURCES
         tsan_rtl_s390x.S
         )
       # Check for Go runtime.
       set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../go/buildgo.sh)
       add_custom_target(GotsanRuntimeCheck
   COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"
     EXTRA_CFLAGS=${EXTRA_CFLAGS}
     IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT}