[llvm] r324869 - [mips] Fix 'l' constraint handling for types smaller than 32 bits

[Simon Atanasyan via llvm-commits]

Sure. My bad, I regularly forget about this problem. I will fix the conflict.

On Mon, Feb 12, 2018 at 2:07 PM, Filipe Cabecinhas <filcab at gmail.com> wrote:
> I think what might be happening is there are two files in tree which
> differ only in case:
> inlineasm-cnstrnt-bad-L.ll
> inlineasm-cnstrnt-bad-l.ll
>
> On Windows (default NTFS is case-insensitive, case-preserving), SVN is
> giving up and complaining about conflicts. On macOS, git is just
> overwriting one of the files when checking out the other (same thing,
> FS is case-insensitive, case-preserving).
>
> Please merge those two files.
>
> Thank you,
>  Filipe
>
> On Mon, Feb 12, 2018 at 10:54 AM, Simon Dardis via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
>> Hi Simon,
>>
>> Can you check this commit? It seems to have left the repo in a strange state. I'm seeing:
>>
>> !       test/CodeGen/Mips/inlineasm-cnstrnt-bad-L.ll
>>
>> with 'svn status'. But I do have 'test/CodeGen/Mips/inlineasm-cnstrnt-bad-l.ll' which this commit
>> added.

-- 
Simon Atanasyan