This is an archive of the discontinued LLVM Phabricator instance.

Differential D107894

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

Authored by mstorsjo on Aug 11 2021, 4:52 AM.

Details

Reviewers
phosek
Commits
rG592adb0b24ac: [CMake] Make the vendor part of default mingw triples consistent
Summary

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.

Diff Detail

Event Timeline

mstorsjo created this revision.Aug 11 2021, 4:52 AM
Herald added subscribers: pengfei, kristof.beyls, mgorny. · View Herald TranscriptAug 11 2021, 4:52 AM
mstorsjo requested review of this revision.Aug 11 2021, 4:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 11 2021, 4:52 AM
Harbormaster completed remote builds in B119049: Diff 365721.Aug 11 2021, 5:37 AM
phosek accepted this revision.Aug 11 2021, 9:43 AM

LGTM

This revision is now accepted and ready to land.Aug 11 2021, 9:43 AM
Closed by commit rG592adb0b24ac: [CMake] Make the vendor part of default mingw triples consistent (authored by mstorsjo). · Explain WhyAug 12 2021, 3:28 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG592adb0b24ac: [CMake] Make the vendor part of default mingw triples consistent.

Revision Contents

PathSize
llvm/
cmake/
modules/
4 lines

Diff 365952

llvm/cmake/modules/GetHostTriple.cmake

Show All 17 Lines if( MSVC )
endif() endif()
elseif( MINGW AND NOT MSYS ) elseif( MINGW AND NOT MSYS )
# CMake doesn't provide COMPILER_ARCHITECTURE_ID for Clang/GCC, # CMake doesn't provide COMPILER_ARCHITECTURE_ID for Clang/GCC,
# but it does for MSVC. # but it does for MSVC.
if( CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ARM.*" ) if( CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ARM.*" )
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( value "aarch64-w64-windows-gnu" ) set( value "aarch64-w64-windows-gnu" )
else() else()
set( value "armv7-pc-windows-gnu" ) set( value "armv7-w64-windows-gnu" )
endif() endif()
else() else()
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( value "x86_64-w64-windows-gnu" ) set( value "x86_64-w64-windows-gnu" )
else() else()
set( value "i686-pc-windows-gnu" ) set( value "i686-w64-windows-gnu" )
endif() endif()
endif() endif()
elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" ) elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" )
set( value "s390x-ibm-zos" ) set( value "s390x-ibm-zos" )
elseif( CMAKE_SYSTEM_NAME STREQUAL AIX ) elseif( CMAKE_SYSTEM_NAME STREQUAL AIX )
# We defer to dynamic detection of the host AIX version. # We defer to dynamic detection of the host AIX version.
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( value "powerpc64-ibm-aix" ) set( value "powerpc64-ibm-aix" )
Show All 20 Lines