maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Mips] Rename class method merge => mergeHeaderFlags 

No functional changes.

llvm-svn: 233548
This commit is contained in:
Simon Atanasyan 2015-03-30 15:07:05 +00:00
parent 13c7ad9cd2
commit a341e38e39
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
View File

@ -64,7 +64,8 @@ MipsELFFlagsMerger::MipsELFFlagsMerger(bool is64Bits)
uint32_t MipsELFFlagsMerger::getMergedELFFlags() const { return _flags; }
std::error_code MipsELFFlagsMerger::merge(uint8_t newClass, uint32_t newFlags) {
std::error_code MipsELFFlagsMerger::mergeHeaderFlags(uint8_t newClass,
uint32_t newFlags) {
// Check bitness.
if (_is64Bit != (newClass == ELFCLASS64))
return make_dynamic_error_code(

2
lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
View File

@ -22,7 +22,7 @@ public:
uint32_t getMergedELFFlags() const;
/// \brief Merge saved ELF header flags and the new set of flags.
std::error_code merge(uint8_t newClass, uint32_t newFlags);
std::error_code mergeHeaderFlags(uint8_t newClass, uint32_t newFlags);
private:
const bool _is64Bit;

4
lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
View File

@ -43,7 +43,7 @@ public:
loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
std::vector<std::unique_ptr<File>> &result) const override {
auto &hdr = *this->elfHeader(*mb);
if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
return ec;
return BaseReaderType::loadFile(std::move(mb), registry, result);
}
@ -65,7 +65,7 @@ public:
loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
std::vector<std::unique_ptr<File>> &result) const override {
auto &hdr = *this->elfHeader(*mb);
if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
return ec;
return BaseReaderType::loadFile(std::move(mb), registry, result);
}