Mirrors
/
cmake
mirror of https://gitlab.kitware.com/cmake/cmake.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LLVMFlang: Update MSVC ABI and architecture detection for LLVMFlang 18.0 

LLVMFlang 18.0 adds MSVC ABI and architecture macros.  Resolve the
corresponding FIXME left by commit 26bf32cdc6 (LLVMFlang: Add support
for targeting MSVC ABI on Windows, 2023-09-28, v3.28.0-rc1~10^2).

Issue: #24840
stage/master/nightly/2023/12/07
Brad King 2023-11-27 16:02:07 -05:00
parent 48302b469e
commit cd28915260
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Modules/CMakeDetermineCompilerId.cmake
View File

@ -174,27 +174,30 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
endif()
endif()
# FIXME(LLVMFlang): It does not provide predefines identifying the MSVC ABI or architecture.
# It should be taught to define _MSC_VER and its _M_* architecture flags.
if("x${lang}" STREQUAL "xFortran" AND "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xLLVMFlang")
# Parse the target triple to detect information we should later be able
# to get during preprocessing above, once LLVMFlang provides it.
# Parse the target triple to detect information not always available from the preprocessor.
if(COMPILER_${lang}_PRODUCED_OUTPUT MATCHES "-triple ([0-9a-z_]*)-.*windows-msvc([0-9]+)\\.([0-9]+)")
set(CMAKE_${lang}_SIMULATE_ID "MSVC")
# CMakeFortranCompilerId.F.in does not extract the _MSC_VER minor version.
# We can do better using the version parsed here.
set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
set(arch ${CMAKE_MATCH_1})
if(arch STREQUAL "x86_64")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "x64")
elseif(arch STREQUAL "aarch64")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "ARM64")
elseif(arch STREQUAL "arm64ec")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "ARM64EC")
elseif(arch MATCHES "^i[3-9]86$")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "X86")
else()
message(FATAL_ERROR "LLVMFlang target architecture unrecognized: ${arch}")
if (CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 18.0)
# LLVMFlang < 18.0 does not provide predefines identifying the MSVC ABI or architecture.
set(CMAKE_${lang}_SIMULATE_ID "MSVC")
set(arch ${CMAKE_MATCH_1})
if(arch STREQUAL "x86_64")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "x64")
elseif(arch STREQUAL "aarch64")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "ARM64")
elseif(arch STREQUAL "arm64ec")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "ARM64EC")
elseif(arch MATCHES "^i[3-9]86$")
set(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID "X86")
else()
message(FATAL_ERROR "LLVMFlang target architecture unrecognized: ${arch}")
endif()
set(MSVC_${lang}_ARCHITECTURE_ID "${CMAKE_${lang}_COMPILER_ARCHITECTURE_ID}")
endif()
set(MSVC_${lang}_ARCHITECTURE_ID "${CMAKE_${lang}_COMPILER_ARCHITECTURE_ID}")
elseif(COMPILER_${lang}_PRODUCED_OUTPUT MATCHES "-triple ([0-9a-z_]*)-.*windows-gnu")
set(CMAKE_${lang}_SIMULATE_ID "GNU")
endif()

2
Modules/CMakeFortranCompilerId.F.in
View File

@ -240,7 +240,7 @@
#else
PRINT *, 'INFO:platform[]'
#endif
#if defined(_WIN32) && (defined(__INTEL_COMPILER) || defined(__ICC))
#if defined(_MSC_VER)
# if defined(_M_IA64)
PRINT *, 'INFO:arch[IA64]'
# elif defined(_M_X64) || defined(_M_AMD64)