[PATCH] D107626: [CMake] Improve GetHostTriple for Windows/ARM configurations

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo created this revision.
mstorsjo added reviewers: phosek, rnk.
Herald added subscribers: pengfei, kristof.beyls, mgorny.
mstorsjo requested review of this revision.
Herald added a project: LLVM.

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.

I made a MR to upstream CMake to make it provide
CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID for GCC and non-MSVC Clang
configurations too, in
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6432,
but I wouldn't want to start relying on that right away.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107626

Files:
  llvm/cmake/modules/GetHostTriple.cmake


Index: llvm/cmake/modules/GetHostTriple.cmake
===================================================================
--- llvm/cmake/modules/GetHostTriple.cmake
+++ 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" )


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107626.364724.patch
Type: text/x-patch
Size: 1633 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210806/967011a0/attachment.bin>