diff --git a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp index b12e39ccd488..cf32f00f3615 100644 --- a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp +++ b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp @@ -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]; } } } diff --git a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp index 4a8d1aeedb11..1cb67d0647f7 100644 --- a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp +++ b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp @@ -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) diff --git a/llvm/tools/llvm-objcopy/MachO/Object.h b/llvm/tools/llvm-objcopy/MachO/Object.h index 703c31fac0e4..a2c007459f2a 100644 --- a/llvm/tools/llvm-objcopy/MachO/Object.h +++ b/llvm/tools/llvm-objcopy/MachO/Object.h @@ -165,7 +165,7 @@ struct RelocationInfo { // The referenced symbol entry. Set if !Scattered && Extern. Optional Symbol; // The referenced section. Set if !Scattered && !Extern. - Optional Section; + Optional 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).