diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2017-01-11 01:06:57 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2017-01-11 01:06:57 +0000 |
commit | b09bec262ba490e35b7acbc0e891018010acb02a (patch) | |
tree | fd2b8e7627f233a47dd21a25584016504c77b655 | |
parent | aac894feba2ddfaebe07a9e97d44c5427f1088cf (diff) | |
download | bcm5719-llvm-b09bec262ba490e35b7acbc0e891018010acb02a.tar.gz bcm5719-llvm-b09bec262ba490e35b7acbc0e891018010acb02a.zip |
tools/llvm-xray: Avoid std::errc::protocol_* to appease mingw, like r285261.
They are oriented from winsock and mingw doesn't import them.
llvm-svn: 291636
-rw-r--r-- | llvm/tools/llvm-xray/xray-converter.cc | 2 | ||||
-rw-r--r-- | llvm/tools/llvm-xray/xray-extract.cc | 2 | ||||
-rw-r--r-- | llvm/tools/llvm-xray/xray-log-reader.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-xray/xray-converter.cc b/llvm/tools/llvm-xray/xray-converter.cc index 914dcd967d7..81fdca2d26c 100644 --- a/llvm/tools/llvm-xray/xray-converter.cc +++ b/llvm/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/llvm/tools/llvm-xray/xray-extract.cc b/llvm/tools/llvm-xray/xray-extract.cc index d7b5bd2b1fe..49ecd742113 100644 --- a/llvm/tools/llvm-xray/xray-extract.cc +++ b/llvm/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/llvm/tools/llvm-xray/xray-log-reader.cc b/llvm/tools/llvm-xray/xray-log-reader.cc index 712aa36d5cb..1dc745fe59a 100644 --- a/llvm/tools/llvm-xray/xray-log-reader.cc +++ b/llvm/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); |