diff options
| author | Simon Atanasyan <simon@atanasyan.com> | 2015-05-27 08:45:31 +0000 |
|---|---|---|
| committer | Simon Atanasyan <simon@atanasyan.com> | 2015-05-27 08:45:31 +0000 |
| commit | bb399f3d57a20800bf153d183875969c2df12723 (patch) | |
| tree | 16579216ecafc42ef573d859bc55d3470892b0fc /lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp | |
| parent | 256f2cadfe298455b3ab70719a94230114ff21f5 (diff) | |
| download | bcm5719-llvm-bb399f3d57a20800bf153d183875969c2df12723.tar.gz bcm5719-llvm-bb399f3d57a20800bf153d183875969c2df12723.zip | |
[ELF][Mips] Do not merge ELF flags in the `isCompatible` routine
We do not need to merge ELF flags from DSO. But `isCompatible` is called
for all input files. So this change move ELF flags merging into the
MipsELFFile class.
llvm-svn: 238304
Diffstat (limited to 'lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp index 72c5d935b6a..8dfc764cda5 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp @@ -40,9 +40,8 @@ MipsLinkingContext::MipsLinkingContext(llvm::Triple triple) : ELFLinkingContext(triple, createTarget(triple, *this)), _flagsMerger(triple.isArch64Bit()) {} -std::error_code MipsLinkingContext::mergeHeaderFlags(uint8_t fileClass, - uint64_t flags) { - return _flagsMerger.mergeHeaderFlags(fileClass, flags); +std::error_code MipsLinkingContext::mergeElfFlags(uint64_t flags) { + return _flagsMerger.mergeFlags(flags); } void MipsLinkingContext::mergeReginfoMask(const MipsReginfo &info) { |
