diff options
| author | Yaron Keren <yaron.keren@gmail.com> | 2014-03-31 07:59:14 +0000 |
|---|---|---|
| committer | Yaron Keren <yaron.keren@gmail.com> | 2014-03-31 07:59:14 +0000 |
| commit | 358d68d3833fe7c12e4f475fd14867f6a37ba1c8 (patch) | |
| tree | b8ccedb81d9a5bb9bd7f1a74e030f709b7aeb10a /lib/Target/X86/MCTargetDesc | |
| parent | 379e2cf307dd2e5e63abe0819db15889c13a4911 (diff) | |
| download | llvm-358d68d3833fe7c12e4f475fd14867f6a37ba1c8.tar.gz llvm-358d68d3833fe7c12e4f475fd14867f6a37ba1c8.tar.bz2 llvm-358d68d3833fe7c12e4f475fd14867f6a37ba1c8.tar.xz | |
Correct OS conditionals following r204977 and r204978.
Previously, MinGW OS was Triple::MinGW and Cygwin was Triple::Cygwin
and now it is Triple::Win32 with Environment being GNU or Cygwin.
So,
TheTriple.getOS() == Triple::Win32
is replaced by
TheTriple.isWindowsMSVCEnvironment()
and
(TheTriple.getOS() == Triple::MinGW32 || TheTriple.getOS() == Triple::Cygwin)
is replaced by
TheTriple.isOSCygMing()
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205170 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/MCTargetDesc')
| -rw-r--r-- | lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 8deba94c80..09fdb9c14e 100644 --- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp @@ -205,8 +205,7 @@ unsigned X86_MC::getDwarfRegFlavour(StringRef TT, bool isEH) { if (TheTriple.isOSDarwin()) return isEH ? DWARFFlavour::X86_32_DarwinEH : DWARFFlavour::X86_32_Generic; - if (TheTriple.getOS() == Triple::MinGW32 || - TheTriple.getOS() == Triple::Cygwin) + if (TheTriple.isOSCygMing()) // Unsupported by now, just quick fallback return DWARFFlavour::X86_32_Generic; return DWARFFlavour::X86_32_Generic; @@ -279,10 +278,9 @@ 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.getOS() == Triple::Win32) { + } else if (TheTriple.isWindowsMSVCEnvironment()) { MAI = new X86MCAsmInfoMicrosoft(TheTriple); - } else if (TheTriple.getOS() == Triple::MinGW32 || - TheTriple.getOS() == Triple::Cygwin) { + } else if (TheTriple.isOSCygMing()) { MAI = new X86MCAsmInfoGNUCOFF(TheTriple); } else { // The default is ELF. |