[llvm] c84ad73 - [CMake] Improve GetHostTriple for Windows/ARM configurations

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2021-08-09T11:31:28+03:00
New Revision: c84ad73a27da69975f9d4c44cae843b30e35542d

URL: https://github.com/llvm/llvm-project/commit/c84ad73a27da69975f9d4c44cae843b30e35542d
DIFF: https://github.com/llvm/llvm-project/commit/c84ad73a27da69975f9d4c44cae843b30e35542d.diff

LOG: [CMake] Improve GetHostTriple for Windows/ARM configurations

In MSVC mode, CMake provides CMAKE_C_COMPILER_ARCHITECTURE_ID,
which should be accurate for what the compiler produces. Keep
the old CMAKE_C_SIZEOF_VOID_P based fallback in case this
doesn't provide matches.

In GCC/MinGW mode, CMake doesn't provide that. As we're trying to
guess the default host architecture, use CMAKE_HOST_SYSTEM_PROCESSOR
in combination with the existing CMAKE_C_SIZEOF_VOID_P check to
estimate whether it's x86/x86_64/arm/aarch64.

Differential Revision: https://reviews.llvm.org/D107626

Added: 
    

Modified: 
    llvm/cmake/modules/GetHostTriple.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake
index a5f033c1110de..f3892f4f5447a 100644
--- 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" )