Merge branch 'cc-msvc-target' into release-0.3

* cc-msvc-target:
  test: Run cc-msvc-builtin-1923 test with suitable target triple
  Detect: Add MSVC target triple component

6 files changed, 13 insertions, 5 deletions

diff --git a/src/Detect.cxx b/src/Detect.cxx
index ec3c6ce..fa88499 100644
--- a/src/Detect.cxx
+++ b/src/Detect.cxx
@@ -96,6 +96,9 @@ static void setTriple(Options& opts)
     triple.setVendorName("pc");
     triple.setOSName("windows");
   }
+  if (pd.find("#define _MSC_VER ") != pd.npos) {
+    triple.setEnvironmentName("msvc");
+  }
   if (pd.find("#define __MINGW32__ 1") != pd.npos) {
     triple.setEnvironmentName("gnu");
   }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4b6139d..8dd7eee 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -400,7 +400,9 @@ castxml_test_cmd(cc-msvc-std-explicit --castxml-cc-msvc "(" $<TARGET_FILE:cc-msv
 castxml_test_cmd(cc-msvc-builtin-1800-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1800 ")" ${empty_cxx} -E -dM)
 castxml_test_cmd(cc-msvc-builtin-1900-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${empty_cxx} -E -dM)
 castxml_test_cmd(cc-msvc-builtin-1900 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${input}/make_integer_seq.cxx)
-castxml_test_cmd(cc-msvc-builtin-1923 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1923 ")" ${input}/assume_aligned.cxx)
+if(";${LLVM_TARGETS_TO_BUILD};" MATCHES ";X86;")
+  castxml_test_cmd(cc-msvc-builtin-1923 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1923 --cc-define=_M_X64 ")" ${input}/assume_aligned.cxx)
+endif()
 castxml_test_cmd(cc-msvc-c-bad-cmd --castxml-cc-msvc-c "(" cc-msvc-c-bad-cmd ")" ${empty_c})
 castxml_test_cmd(cc-msvc-c-src-c-E --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} -E -dM)
 castxml_test_cmd(cc-msvc-c-src-c-cmd --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} "-###")
diff --git a/test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt b/test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt
index c3aedee..94d0708 100644
--- a/test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt
+++ b/test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt
@@ -1,3 +1,4 @@
 Target: amd64-[^
-]+
+]+-msvc[^
+]*
 .
diff --git a/test/expect/cmd.cc-msvc-tgt-i386.stderr.txt b/test/expect/cmd.cc-msvc-tgt-i386.stderr.txt
index cb02cd7..618b26f 100644
--- a/test/expect/cmd.cc-msvc-tgt-i386.stderr.txt
+++ b/test/expect/cmd.cc-msvc-tgt-i386.stderr.txt
@@ -1,3 +1,4 @@
 Target: i386-[^
-]+
+]+-msvc[^
+]*
 .
diff --git a/test/expect/cmd.cc-msvc-tgt-win.stderr.txt b/test/expect/cmd.cc-msvc-tgt-win.stderr.txt
index 05f7eea..93064ab 100644
--- a/test/expect/cmd.cc-msvc-tgt-win.stderr.txt
+++ b/test/expect/cmd.cc-msvc-tgt-win.stderr.txt
@@ -1,4 +1,4 @@
 Target: [^
--]+-pc-windows[^
+-]+-pc-windows-msvc[^
 ]*
 .
diff --git a/test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt b/test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt
index 17ecd16..fad6c0a 100644
--- a/test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt
+++ b/test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt
@@ -1,3 +1,4 @@
 Target: x86_64-[^
-]+
+]+-msvc[^
+]*
 .