[llvm] r207349 - MC: restore behaviour of defaulting to ELF

[Rafael Espíndola]

Why? There was a bot failure? Was the original change discussed
somewhere? If this revert is not a temporary thing, could you add a
test showing that we default to ELF?

On 27 April 2014 00:54, Saleem Abdulrasool <compnerd at compnerd.org> wrote:
> Author: compnerd
> Date: Sat Apr 26 23:54:16 2014
> New Revision: 207349
>
> URL: http://llvm.org/viewvc/llvm-project?rev=207349&view=rev
> Log:
> MC: restore behaviour of defaulting to ELF
>
> This restores the previous behaviour of just assuming that if you dont specify a
> valid triple that you really meant the default triple with an ELF object file.
>
> Modified:
>     llvm/trunk/lib/MC/MCObjectFileInfo.cpp
>
> Modified: llvm/trunk/lib/MC/MCObjectFileInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=207349&r1=207348&r2=207349&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCObjectFileInfo.cpp (original)
> +++ llvm/trunk/lib/MC/MCObjectFileInfo.cpp Sat Apr 26 23:54:16 2014
> @@ -780,10 +780,9 @@ void MCObjectFileInfo::InitMCObjectFileI
>        (T.isOSDarwin() || T.isOSBinFormatMachO())) {
>      Env = IsMachO;
>      InitMachOMCObjectFileInfo(T);
> -  } else if (T.isOSWindows() && T.getObjectFormat() == Triple::COFF) {
> -    assert((Arch == Triple::x86 || Arch == Triple::x86_64 ||
> -            Arch == Triple::arm || Arch == Triple::thumb) &&
> -           "unsupported Windows COFF architecture");
> +  } else if ((Arch == Triple::x86 || Arch == Triple::x86_64 ||
> +              Arch == Triple::arm || Arch == Triple::thumb) &&
> +             (T.isOSWindows() && T.getObjectFormat() == Triple::COFF)) {
>      Env = IsCOFF;
>      InitCOFFMCObjectFileInfo(T);
>    } else {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits