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

[llvm-objcopy][MachO] Fix build 

Some compilers are confused when the same name is used in different contexts.
Rename the field Section to unbreak the build.
(Caught by the buildbot http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/22374)
This commit is contained in:
Alexander Shaposhnikov 2020-04-27 18:20:01 -07:00
parent 0db3a5a93e
commit 29c6f5c7fd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
View File

@ -222,7 +222,7 @@ void MachOReader::setSymbolInRelocationInfo(Object &O) const {
// if we encounter an invalid relocation.
assert(SymbolNum >= 1 && SymbolNum <= Sections.size() &&
"Invalid section index.");
Reloc.Section = Sections[SymbolNum - 1];
Reloc.Sec = Sections[SymbolNum - 1];
}
}
}

2
llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
View File

@ -243,7 +243,7 @@ void MachOWriter::writeSections() {
if (!RelocInfo.Scattered) {
const uint32_t SymbolNum = RelocInfo.Extern
? (*RelocInfo.Symbol)->Index
: (*RelocInfo.Section)->Index;
: (*RelocInfo.Sec)->Index;
RelocInfo.setPlainRelocationSymbolNum(SymbolNum, IsLittleEndian);
}
if (IsLittleEndian != sys::IsLittleEndianHost)

2
llvm/tools/llvm-objcopy/MachO/Object.h
View File

@ -165,7 +165,7 @@ struct RelocationInfo {
// The referenced symbol entry. Set if !Scattered && Extern.
Optional<const SymbolEntry *> Symbol;
// The referenced section. Set if !Scattered && !Extern.
Optional<const Section *> Section;
Optional<const Section *> Sec;
// True if Info is a scattered_relocation_info.
bool Scattered;
// True if the r_symbolnum points to a section number (i.e. r_extern=0).