<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Jul 17, 2015 at 4:59 PM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sounds good to me. Richard: I suppose this falls under your ownership;<br>
OK for merging?<br></blockquote><div> </div><div>Yes.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
On Fri, Jul 17, 2015 at 4:52 PM, Saleem Abdulrasool<br>
<<a href="mailto:compnerd@compnerd.org">compnerd@compnerd.org</a>> wrote:<br>
> Hi Hans,<br>
><br>
> Would you be so kind as to back port this to the 3.7 branch?  It is a low<br>
> risk change and enables the use of non-COFF object files with MS ABI on<br>
> Windows.<br>
><br>
> Thanks!<br>
<div class="HOEnZb"><div class="h5">><br>
> On Friday, July 17, 2015, Saleem Abdulrasool <<a href="mailto:compnerd@compnerd.org">compnerd@compnerd.org</a>> wrote:<br>
>><br>
>> Author: compnerd<br>
>> Date: Fri Jul 17 16:26:41 2015<br>
>> New Revision: 242574<br>
>><br>
>> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D242574-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=5RToMJEgTzf9zUdN7RDzXNnobLGNdolsWoQ-ewXOZr0&s=L8dKGFatn5EFGW-Q3CsNryOT6UD2JIFFZ732lzFEN7o&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=242574&view=rev</a><br>
>> Log:<br>
>> basic: default to MSVC on Windows<br>
>><br>
>> The "armv7-windows", "i686-windows", and "x86_64-windows" targets should<br>
>> be<br>
>> equivalent to the MSVC environment.  This was previously discussed when<br>
>> the<br>
>> triples for Windows werw canonicalised.  Im not sure how this was<br>
>> overlooked.<br>
>> This fixes the emission of non-COFF formats on Windows.<br>
>><br>
>> Thanks to ki9a for reporting this issue over IRC!<br>
>><br>
>> Modified:<br>
>>     cfe/trunk/lib/Basic/Targets.cpp<br>
>><br>
>> Modified: cfe/trunk/lib/Basic/Targets.cpp<br>
>> URL:<br>
>> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_lib_Basic_Targets.cpp-3Frev-3D242574-26r1-3D242573-26r2-3D242574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=5RToMJEgTzf9zUdN7RDzXNnobLGNdolsWoQ-ewXOZr0&s=i47yW8j-VEonmuBgtnLBA7qxSUohiJDmLhyudHEi850&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=242574&r1=242573&r2=242574&view=diff</a><br>
>><br>
>><br>
>> ==============================================================================<br>
>> --- cfe/trunk/lib/Basic/Targets.cpp (original)<br>
>> +++ cfe/trunk/lib/Basic/Targets.cpp Fri Jul 17 16:26:41 2015<br>
>> @@ -7084,8 +7084,6 @@ static TargetInfo *AllocateTarget(const<br>
>>        return new NaClTargetInfo<ARMleTargetInfo>(Triple);<br>
>>      case llvm::Triple::Win32:<br>
>>        switch (Triple.getEnvironment()) {<br>
>> -      default:<br>
>> -        return new ARMleTargetInfo(Triple);<br>
>>        case llvm::Triple::Cygnus:<br>
>>          return new CygwinARMTargetInfo(Triple);<br>
>>        case llvm::Triple::GNU:<br>
>> @@ -7093,6 +7091,7 @@ static TargetInfo *AllocateTarget(const<br>
>>        case llvm::Triple::Itanium:<br>
>>          return new ItaniumWindowsARMleTargetInfo(Triple);<br>
>>        case llvm::Triple::MSVC:<br>
>> +      default: // Assume MSVC for unknown environments<br>
>>          return new MicrosoftARMleTargetInfo(Triple);<br>
>>        }<br>
>>      default:<br>
>> @@ -7347,14 +7346,13 @@ static TargetInfo *AllocateTarget(const<br>
>>        return new SolarisTargetInfo<X86_32TargetInfo>(Triple);<br>
>>      case llvm::Triple::Win32: {<br>
>>        switch (Triple.getEnvironment()) {<br>
>> -      default:<br>
>> -        return new X86_32TargetInfo(Triple);<br>
>>        case llvm::Triple::Cygnus:<br>
>>          return new CygwinX86_32TargetInfo(Triple);<br>
>>        case llvm::Triple::GNU:<br>
>>          return new MinGWX86_32TargetInfo(Triple);<br>
>>        case llvm::Triple::Itanium:<br>
>>        case llvm::Triple::MSVC:<br>
>> +      default: // Assume MSVC for unknown environments<br>
>>          return new MicrosoftX86_32TargetInfo(Triple);<br>
>>        }<br>
>>      }<br>
>> @@ -7399,11 +7397,10 @@ static TargetInfo *AllocateTarget(const<br>
>>        return new SolarisTargetInfo<X86_64TargetInfo>(Triple);<br>
>>      case llvm::Triple::Win32: {<br>
>>        switch (Triple.getEnvironment()) {<br>
>> -      default:<br>
>> -        return new X86_64TargetInfo(Triple);<br>
>>        case llvm::Triple::GNU:<br>
>>          return new MinGWX86_64TargetInfo(Triple);<br>
>>        case llvm::Triple::MSVC:<br>
>> +      default: // Assume MSVC for unknown environments<br>
>>          return new MicrosoftX86_64TargetInfo(Triple);<br>
>>        }<br>
>>      }<br>
>><br>
>><br>
>> _______________________________________________<br>
>> cfe-commits mailing list<br>
>> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
><br>
><br>
><br>
</div></div><span class="HOEnZb"><font color="#888888">> --<br>
> Saleem Abdulrasool<br>
> compnerd (at) compnerd (dot) org<br>
</font></span></blockquote></div><br></div></div>