diff options
| author | Simon Atanasyan <simon@atanasyan.com> | 2015-03-30 15:07:05 +0000 |
|---|---|---|
| committer | Simon Atanasyan <simon@atanasyan.com> | 2015-03-30 15:07:05 +0000 |
| commit | a341e38e39a6d19f57672cd734b3ba34dfbadebc (patch) | |
| tree | 2c8634ea04744a64e6770a92e82d2bd827924f84 /lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp | |
| parent | 13c7ad9cd245fca52773ac47e53da1cb46b38320 (diff) | |
| download | bcm5719-llvm-a341e38e39a6d19f57672cd734b3ba34dfbadebc.tar.gz bcm5719-llvm-a341e38e39a6d19f57672cd734b3ba34dfbadebc.zip | |
[Mips] Rename class method merge => mergeHeaderFlags
No functional changes.
llvm-svn: 233548
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( |
