[llvm] r291863 - xray-account: Avoid std::errc::bad_message to appease mingw.

Hans Wennborg via llvm-commits llvm-commits at lists.llvm.org
Fri Jan 13 09:08:36 PST 2017


I think it makes sense for the branch, so I've merged it in r291914.

Thanks,
Hans

On Thu, Jan 12, 2017 at 5:22 PM, NAKAMURA Takumi <geek4civic at gmail.com> wrote:
> I didn't know the branch. I have no idea for it.
>
> On Fri, Jan 13, 2017 at 9:45 AM Hans Wennborg <hans at chromium.org> wrote:
>>
>> On Thu, Jan 12, 2017 at 4:17 PM, NAKAMURA Takumi via llvm-commits
>> <llvm-commits at lists.llvm.org> wrote:
>> > Author: chapuni
>> > Date: Thu Jan 12 18:17:15 2017
>> > New Revision: 291863
>> >
>> > URL: http://llvm.org/viewvc/llvm-project?rev=291863&view=rev
>> > Log:
>> > xray-account: Avoid std::errc::bad_message to appease mingw.
>> >
>> > Modified:
>> >     llvm/trunk/tools/llvm-xray/xray-account.cc
>> >
>> > Modified: llvm/trunk/tools/llvm-xray/xray-account.cc
>> > URL:
>> > http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-account.cc?rev=291863&r1=291862&r2=291863&view=diff
>> >
>> > ==============================================================================
>> > --- llvm/trunk/tools/llvm-xray/xray-account.cc (original)
>> > +++ llvm/trunk/tools/llvm-xray/xray-account.cc Thu Jan 12 18:17:15 2017
>> > @@ -463,7 +463,7 @@ static CommandRegistration Unused(&Accou
>> >          return make_error<StringError>(
>> >              Twine("Failed accounting function calls in file '") +
>> > AccountInput +
>> >                  "'.",
>> > -            std::make_error_code(std::errc::bad_message));
>> > +            std::make_error_code(std::errc::executable_format_error));
>> >      }
>> >      switch (AccountOutputFormat) {
>> >      case AccountOutputFormats::TEXT:
>>
>> Should we merge this to llvm 4?


More information about the llvm-commits mailing list