[llvm] r205170 - Correct OS conditionals following r204977 and r204978.

[Rafael Espíndola]

testcase?

On 31 March 2014 03:59, Yaron Keren <yaron.keren at gmail.com> wrote:
> Author: yrnkrn
> Date: Mon Mar 31 02:59:14 2014
> New Revision: 205170
>
> URL: http://llvm.org/viewvc/llvm-project?rev=205170&view=rev
> Log:
> 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()
>
>
>
> Modified:
>     llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp?rev=205170&r1=205169&r2=205170&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp (original)
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp Mon Mar 31 02:59:14 2014
> @@ -205,8 +205,7 @@ unsigned X86_MC::getDwarfRegFlavour(Stri
>
>    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(con
>    } 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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits