[llvm] 592adb0 - [CMake] Make the vendor part of default mingw triples consistent

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2021-08-12T13:27:09+03:00
New Revision: 592adb0b24aca2ccc88d9f5f1c427361897d1172

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

LOG: [CMake] Make the vendor part of default mingw triples consistent

Consistently use 'w64' as vendor string; it was 'pc' for the original
i686 triple added in 91bd6c922d7cf, but the later x86_64 triple
used 'w64' as vendor, added in d6c1f37f86440.

When the arm triples were added in c84ad73a27da6, the differing
vendors were copied over accidentally to the arm targets too.

When using per-target runtime directories, having inconsistent vendor
parts of the target triples is fatal.

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

Added: 
    

Modified: 
    llvm/cmake/modules/GetHostTriple.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake
index f3892f4f5447a..1be13bc01ab9b 100644
--- a/llvm/cmake/modules/GetHostTriple.cmake
+++ b/llvm/cmake/modules/GetHostTriple.cmake
@@ -23,13 +23,13 @@ function( get_host_triple var )
       if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
         set( value "aarch64-w64-windows-gnu" )
       else()
-        set( value "armv7-pc-windows-gnu" )
+        set( value "armv7-w64-windows-gnu" )
       endif()
     else()
       if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
         set( value "x86_64-w64-windows-gnu" )
       else()
-        set( value "i686-pc-windows-gnu" )
+        set( value "i686-w64-windows-gnu" )
       endif()
     endif()
   elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" )