From: Reid Kleckner <reid@kleckner.net>
Date: Mon, 17 Nov 2014 22:55:59 +0000 (+0000)
Subject: Revert "ADT: correctly report isMSVCEnvironment for windows itanium"
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8083adcaca55889a224904c2fcca6151137c9e14;p=oota-llvm.git

Revert "ADT: correctly report isMSVCEnvironment for windows itanium"

This reverts commit r222180.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222188 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index 20a6b0a2c25..443239063c0 100644
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -371,7 +371,6 @@ public:
   bool isWindowsMSVCEnvironment() const {
     return getOS() == Triple::Win32 &&
            (getEnvironment() == Triple::UnknownEnvironment ||
-            getEnvironment() == Triple::Itanium ||
             getEnvironment() == Triple::MSVC);
   }
 
diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index 56e4deb6b39..98190ba6ba0 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -221,7 +221,7 @@ static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) {
     MAI = new ARMMCAsmInfoDarwin(TT);
   else if (TheTriple.isWindowsItaniumEnvironment())
     MAI = new ARMCOFFMCAsmInfoGNU();
-  else if (TheTriple.isKnownWindowsMSVCEnvironment())
+  else if (TheTriple.isWindowsMSVCEnvironment())
     MAI = new ARMCOFFMCAsmInfoMicrosoft();
   else
     MAI = new ARMELFMCAsmInfo(TT);
diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index d6dab5309ec..5a9181df70e 100644
--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -270,7 +270,7 @@ static MCAsmInfo *createX86MCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) {
   } else if (TheTriple.isOSBinFormatELF()) {
     // Force the use of an ELF container.
     MAI = new X86ELFMCAsmInfo(TheTriple);
-  } else if (TheTriple.isKnownWindowsMSVCEnvironment()) {
+  } else if (TheTriple.isWindowsMSVCEnvironment()) {
     MAI = new X86MCAsmInfoMicrosoft(TheTriple);
   } else if (TheTriple.isOSCygMing() ||
              TheTriple.isWindowsItaniumEnvironment()) {