From: Hans Wennborg Date: Fri, 13 Jan 2017 16:57:29 +0000 (+0000) Subject: Merging r291863: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b45bfee9fca7bd4335fc91b3c1e6823df206e23;p=llvm Merging r291863: ------------------------------------------------------------------------ r291863 | chapuni | 2017-01-12 16:17:15 -0800 (Thu, 12 Jan 2017) | 1 line xray-account: Avoid std::errc::bad_message to appease mingw. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_40@291914 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/llvm-xray/xray-account.cc b/tools/llvm-xray/xray-account.cc index 84a7da2470a..671a5a073ee 100644 --- a/tools/llvm-xray/xray-account.cc +++ b/tools/llvm-xray/xray-account.cc @@ -463,7 +463,7 @@ static CommandRegistration Unused(&Account, []() -> Error { return make_error( 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: