RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Revert "ADT: correctly report isMSVCEnvironment for windows itanium"

Browse Source 
This reverts commit r222180.

llvm-svn: 222188
This commit is contained in:
Reid Kleckner 2014-11-17 22:55:59 +00:00
parent 6fac8481fc
commit 0ae02a3892
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/ADT/Triple.h
View File

@ -371,7 +371,6 @@ public:
bool isWindowsMSVCEnvironment() const { bool isWindowsMSVCEnvironment() const {
return getOS() == Triple::Win32 && return getOS() == Triple::Win32 &&
(getEnvironment() == Triple::UnknownEnvironment || (getEnvironment() == Triple::UnknownEnvironment ||
getEnvironment() == Triple::Itanium ||
getEnvironment() == Triple::MSVC); getEnvironment() == Triple::MSVC);
} }

2
lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
View File

@ -221,7 +221,7 @@ static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) {
MAI = new ARMMCAsmInfoDarwin(TT); MAI = new ARMMCAsmInfoDarwin(TT);
else if (TheTriple.isWindowsItaniumEnvironment()) else if (TheTriple.isWindowsItaniumEnvironment())
MAI = new ARMCOFFMCAsmInfoGNU(); MAI = new ARMCOFFMCAsmInfoGNU();
else if (TheTriple.isKnownWindowsMSVCEnvironment()) else if (TheTriple.isWindowsMSVCEnvironment())
MAI = new ARMCOFFMCAsmInfoMicrosoft(); MAI = new ARMCOFFMCAsmInfoMicrosoft();
else else
MAI = new ARMELFMCAsmInfo(TT); MAI = new ARMELFMCAsmInfo(TT);

2
lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
View File

@ -270,7 +270,7 @@ static MCAsmInfo *createX86MCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) {
} else if (TheTriple.isOSBinFormatELF()) { } else if (TheTriple.isOSBinFormatELF()) {
// Force the use of an ELF container. // Force the use of an ELF container.
MAI = new X86ELFMCAsmInfo(TheTriple); MAI = new X86ELFMCAsmInfo(TheTriple);
} else if (TheTriple.isKnownWindowsMSVCEnvironment()) { } else if (TheTriple.isWindowsMSVCEnvironment()) {
MAI = new X86MCAsmInfoMicrosoft(TheTriple); MAI = new X86MCAsmInfoMicrosoft(TheTriple);
} else if (TheTriple.isOSCygMing() || } else if (TheTriple.isOSCygMing() ||
TheTriple.isWindowsItaniumEnvironment()) { TheTriple.isWindowsItaniumEnvironment()) {