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

[Martin Storsjö via Phabricator via llvm-commits]

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

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 <https://reviews.llvm.org/rGc84ad73a27da69975f9d4c44cae843b30e35542d>, 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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107894

Files:
  llvm/cmake/modules/GetHostTriple.cmake


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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107894.365721.patch
Type: text/x-patch
Size: 707 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210811/a55cdbde/attachment.bin>