r339307 - [CMake] Use normalized Windows target triples
Petr Hosek via cfe-commits
cfe-commits at lists.llvm.org
Wed Aug 8 19:16:19 PDT 2018
Author: phosek
Date: Wed Aug 8 19:16:18 2018
New Revision: 339307
URL: http://llvm.org/viewvc/llvm-project?rev=339307&view=rev
Log:
[CMake] Use normalized Windows target triples
Changes the default Windows target triple returned by
GetHostTriple.cmake from the old environment names (which we wanted to
move away from) to newer, normalized ones. This also requires updating
all tests to use the new systems names in constraints.
Differential Revision: https://reviews.llvm.org/D47381
Modified:
cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c
cfe/trunk/test/CodeGenCXX/vtable-debug-info.cpp
cfe/trunk/test/Driver/coverage_no_integrated_as.c
cfe/trunk/test/Driver/crash-report-null.test
cfe/trunk/test/Driver/inhibit-downstream-commands.c
cfe/trunk/test/Driver/linker-opts.c
cfe/trunk/test/Driver/no-integrated-as.s
cfe/trunk/test/Lexer/cross-windows-on-linux.cpp
cfe/trunk/test/Modules/crash-vfs-path-emptydir-entries.m
cfe/trunk/test/Modules/crash-vfs-path-symlink-component.m
cfe/trunk/test/Modules/crash-vfs-path-symlink-topheader.m
cfe/trunk/test/Modules/crash-vfs-path-traversal.m
cfe/trunk/test/Modules/crash-vfs-relative-overlay.m
cfe/trunk/test/Modules/crash-vfs-umbrella-frameworks.m
cfe/trunk/test/SemaTemplate/instantiation-depth-default.cpp
cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m
cfe/trunk/test/lit.cfg.py
Modified: cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c (original)
+++ cfe/trunk/test/CodeGen/2007-06-18-SextAttrAggregate.c Wed Aug 8 19:16:18 2018
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 %s -o - -emit-llvm | FileCheck %s
-// XFAIL: aarch64, arm64, x86_64-pc-win32, x86_64-w64-mingw32, x86_64-pc-windows-gnu
+// XFAIL: aarch64, arm64, x86_64-pc-windows-msvc, x86_64-w64-windows-gnu, x86_64-pc-windows-gnu
// PR1513
Modified: cfe/trunk/test/CodeGenCXX/vtable-debug-info.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/vtable-debug-info.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/vtable-debug-info.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/vtable-debug-info.cpp Wed Aug 8 19:16:18 2018
@@ -1,6 +1,6 @@
// RUN: %clang -emit-llvm -S -g %s -o /dev/null
// Radar 8730409
-// XFAIL: win32
+// XFAIL: windows-msvc
// FIXME: This test crashes on *-pc-win32
// for lack of debugging support on -integrated-as (MCCOFF).
Modified: cfe/trunk/test/Driver/coverage_no_integrated_as.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/coverage_no_integrated_as.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Driver/coverage_no_integrated_as.c (original)
+++ cfe/trunk/test/Driver/coverage_no_integrated_as.c Wed Aug 8 19:16:18 2018
@@ -1,5 +1,5 @@
// REQUIRES: clang-driver
-// XFAIL: win32,win64
+// XFAIL: windows-msvc
// RUN: %clang -### -S -fprofile-arcs %s 2>&1 | FileCheck -check-prefix=CHECK-GCNO-DEFAULT-LOCATION %s
// RUN: %clang -### -S -fprofile-arcs -no-integrated-as %s 2>&1 | FileCheck -check-prefix=CHECK-GCNO-DEFAULT-LOCATION %s
Modified: cfe/trunk/test/Driver/crash-report-null.test
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-null.test?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Driver/crash-report-null.test (original)
+++ cfe/trunk/test/Driver/crash-report-null.test Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH=1 %clang -fsyntax-only -x c /dev/null -lstdc++ 2>&1 | FileCheck %s
// FIXME: Investigating. "fatal error: file 'nul' modified since it was first processed"
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// CHECK: Preprocessed source(s) and associated run script(s) are located at:
// CHECK-NEXT: note: diagnostic msg: {{.*}}null-{{.*}}.c
Modified: cfe/trunk/test/Driver/inhibit-downstream-commands.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/inhibit-downstream-commands.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Driver/inhibit-downstream-commands.c (original)
+++ cfe/trunk/test/Driver/inhibit-downstream-commands.c Wed Aug 8 19:16:18 2018
@@ -2,5 +2,5 @@
// CHECK: error: unknown type name 'invalid'
// CHECK-NOT: clang: error: assembler command failed
// CHECK-NOT: clang: error: linker command failed
-// XFAIL: win32
+// XFAIL: windows-msvc
invalid C code!
Modified: cfe/trunk/test/Driver/linker-opts.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/linker-opts.c?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linker-opts.c (original)
+++ cfe/trunk/test/Driver/linker-opts.c Wed Aug 8 19:16:18 2018
@@ -5,7 +5,7 @@
// CHECK: "-L{{.*}}/test1"
// GCC driver is used as linker on cygming. It should be aware of LIBRARY_PATH.
-// XFAIL: win32
+// XFAIL: windows-msvc
// REQUIRES: clang-driver
// REQUIRES: native
Modified: cfe/trunk/test/Driver/no-integrated-as.s
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/no-integrated-as.s?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Driver/no-integrated-as.s (original)
+++ cfe/trunk/test/Driver/no-integrated-as.s Wed Aug 8 19:16:18 2018
@@ -1,6 +1,6 @@
; RUN: %clang -### -no-integrated-as -c %s 2>&1 | FileCheck %s -check-prefix IAS
; Windows doesn't support no-integrated-as
-; XFAIL: win32,win64
+; XFAIL: windows-msvc
;
; Make sure the current file's filename appears in the output.
; We can't generically match on the assembler name, so we just make sure
Modified: cfe/trunk/test/Lexer/cross-windows-on-linux.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cross-windows-on-linux.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Lexer/cross-windows-on-linux.cpp (original)
+++ cfe/trunk/test/Lexer/cross-windows-on-linux.cpp Wed Aug 8 19:16:18 2018
@@ -8,7 +8,7 @@
// expected to fail on windows as the inclusion would succeed and the
// compilation will fail due to the '#error success'.
-// XFAIL: win32
+// XFAIL: windows-msvc
// This test may or may not fail since 'Inputs\success.h' is passed
// to Win32 APIs on Windows.
Modified: cfe/trunk/test/Modules/crash-vfs-path-emptydir-entries.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-path-emptydir-entries.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-path-emptydir-entries.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-path-emptydir-entries.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// Test clang can collect symbolic link headers used in modules.
// crash reproducer if there's a symbolic link header file used in a module.
Modified: cfe/trunk/test/Modules/crash-vfs-path-symlink-component.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-path-symlink-component.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-path-symlink-component.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-path-symlink-component.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// Test that clang is capable of collecting the right header files in the
// crash reproducer if there's a symbolic link component in the path.
Modified: cfe/trunk/test/Modules/crash-vfs-path-symlink-topheader.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-path-symlink-topheader.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-path-symlink-topheader.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-path-symlink-topheader.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// Test clang can collect symbolic link headers used in modules.
// crash reproducer if there's a symbolic link header file used in a module.
Modified: cfe/trunk/test/Modules/crash-vfs-path-traversal.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-path-traversal.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-path-traversal.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-path-traversal.m Wed Aug 8 19:16:18 2018
@@ -3,7 +3,7 @@
// FIXME: Canonicalizing paths to remove relative traversal components
// currenty fails a unittest on windows and is disable by default.
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t
Modified: cfe/trunk/test/Modules/crash-vfs-relative-overlay.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-relative-overlay.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-relative-overlay.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-relative-overlay.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t
Modified: cfe/trunk/test/Modules/crash-vfs-umbrella-frameworks.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/crash-vfs-umbrella-frameworks.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/Modules/crash-vfs-umbrella-frameworks.m (original)
+++ cfe/trunk/test/Modules/crash-vfs-umbrella-frameworks.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t
Modified: cfe/trunk/test/SemaTemplate/instantiation-depth-default.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiation-depth-default.cpp?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiation-depth-default.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiation-depth-default.cpp Wed Aug 8 19:16:18 2018
@@ -14,4 +14,4 @@ template<int N, typename T> struct X : X
X<0, int> x; // expected-note {{in instantiation of}}
// FIXME: It crashes. Investigating.
-// UNSUPPORTED: mingw32
+// UNSUPPORTED: windows-gnu
Modified: cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m (original)
+++ cfe/trunk/test/VFS/umbrella-framework-import-skipnonexist.m Wed Aug 8 19:16:18 2018
@@ -1,7 +1,7 @@
// REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: mingw32
+// XFAIL: windows-gnu
// RUN: rm -rf %t
// RUN: mkdir -p %t/vdir %t/outdir %t/cache
Modified: cfe/trunk/test/lit.cfg.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg.py?rev=339307&r1=339306&r2=339307&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg.py (original)
+++ cfe/trunk/test/lit.cfg.py Wed Aug 8 19:16:18 2018
@@ -137,7 +137,7 @@ if os.path.exists('/dev/fd/0') and sys.p
config.available_features.add('dev-fd-fs')
# Not set on native MS environment.
-if not re.match(r'.*-win32$', config.target_triple):
+if not re.match(r'.*-(windows-msvc)$', config.target_triple):
config.available_features.add('non-ms-sdk')
# Not set on native PS4 environment.
@@ -145,7 +145,7 @@ if not re.match(r'.*-scei-ps4', config.t
config.available_features.add('non-ps4-sdk')
# [PR8833] LLP64-incompatible tests
-if not re.match(r'^x86_64.*-(win32|mingw32|windows-gnu)$', config.target_triple):
+if not re.match(r'^x86_64.*-(windows-msvc|windows-gnu)$', config.target_triple):
config.available_features.add('LP64')
# [PR12920] "clang-driver" -- set if gcc driver is not used.
More information about the cfe-commits
mailing list