From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Wed, 11 Jan 2017 01:06:57 +0000 (+0000)
Subject: tools/llvm-xray: Avoid std::errc::protocol_* to appease mingw, like r285261.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91424c30232d542c28c445d9b6e27f9d4a86d3c9;p=llvm

tools/llvm-xray: Avoid std::errc::protocol_* to appease mingw, like r285261.

They are oriented from winsock and mingw doesn't import them.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291636 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-xray/xray-converter.cc b/tools/llvm-xray/xray-converter.cc
index 914dcd967d7..81fdca2d26c 100644
--- a/tools/llvm-xray/xray-converter.cc
+++ b/tools/llvm-xray/xray-converter.cc
@@ -195,7 +195,7 @@ static CommandRegistration Unused(&Convert, []() -> Error {
     return joinErrors(
         make_error<StringError>(
             Twine("Failed loading input file '") + ConvertInput + "'.",
-            std::make_error_code(std::errc::protocol_error)),
+            std::make_error_code(std::errc::executable_format_error)),
         std::move(Err));
 
   raw_fd_ostream OS(ConvertOutput, EC,
diff --git a/tools/llvm-xray/xray-extract.cc b/tools/llvm-xray/xray-extract.cc
index d7b5bd2b1fe..49ecd742113 100644
--- a/tools/llvm-xray/xray-extract.cc
+++ b/tools/llvm-xray/xray-extract.cc
@@ -254,7 +254,7 @@ InstrumentationMapExtractor::InstrumentationMapExtractor(std::string Filename,
               make_error<StringError>(
                   Twine("Cannot load YAML instrumentation map from '") +
                       Filename + "'.",
-                  std::make_error_code(std::errc::wrong_protocol_type)),
+                  std::make_error_code(std::errc::executable_format_error)),
               std::move(E));
         });
     break;
diff --git a/tools/llvm-xray/xray-log-reader.cc b/tools/llvm-xray/xray-log-reader.cc
index 712aa36d5cb..1dc745fe59a 100644
--- a/tools/llvm-xray/xray-log-reader.cc
+++ b/tools/llvm-xray/xray-log-reader.cc
@@ -123,7 +123,7 @@ Error llvm::xray::NaiveLogLoader(StringRef Data, XRayFileHeader &FileHeader,
     default:
       return make_error<StringError>(
           Twine("Unknown record type '") + Twine(int{Type}) + "'",
-          std::make_error_code(std::errc::protocol_error));
+          std::make_error_code(std::errc::executable_format_error));
     }
     Record.FuncId = RecordExtractor.getSigned(&OffsetPtr, sizeof(int32_t));
     Record.TSC = RecordExtractor.getU64(&OffsetPtr);