diff options
Diffstat (limited to 'lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp index 0ef2c70b815..68138fffd0a 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp @@ -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( |
