diff --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake --- a/llvm/cmake/modules/GetHostTriple.cmake +++ b/llvm/cmake/modules/GetHostTriple.cmake @@ -3,16 +3,34 @@ function( get_host_triple var ) if( MSVC ) - if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + if( CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM64.*" ) + set( value "aarch64-pc-windows-msvc" ) + elseif( CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "ARM.*" ) + set( value "armv7-pc-windows-msvc" ) + elseif( CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "x64" ) + set( value "x86_64-pc-windows-msvc" ) + elseif( CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "X86" ) + set( value "i686-pc-windows-msvc" ) + elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) set( value "x86_64-pc-windows-msvc" ) else() set( value "i686-pc-windows-msvc" ) endif() elseif( MINGW AND NOT MSYS ) - if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set( value "x86_64-w64-windows-gnu" ) + # CMake doesn't provide COMPILER_ARCHITECTURE_ID for Clang/GCC, + # but it does for MSVC. + if( CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ARM.*" ) + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + set( value "aarch64-w64-windows-gnu" ) + else() + set( value "armv7-pc-windows-gnu" ) + endif() else() - set( value "i686-pc-windows-gnu" ) + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + set( value "x86_64-w64-windows-gnu" ) + else() + set( value "i686-pc-windows-gnu" ) + endif() endif() elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" ) set( value "s390x-ibm-zos" )