diff options
Diffstat (limited to 'llvm/lib')
5 files changed, 16 insertions, 15 deletions
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp index 879f894ab1d..2e15af69f4c 100644 --- a/llvm/lib/MC/MCAssembler.cpp +++ b/llvm/lib/MC/MCAssembler.cpp @@ -300,9 +300,6 @@ MCSectionData::MCSectionData(MCSection &Section, MCAssembler *A) A->getSectionList().push_back(this); } -unsigned MCSectionData::getOrdinal() const { return Section->getOrdinal(); } -void MCSectionData::setOrdinal(unsigned Value) { Section->setOrdinal(Value); } - MCSectionData::iterator MCSectionData::getSubsectionInsertionPoint(unsigned Subsection) { if (Subsection == 0 && SubsectionFragmentMap.empty()) @@ -892,7 +889,7 @@ void MCAssembler::Finish() { if (it->getFragmentList().empty()) new MCDataFragment(it); - it->setOrdinal(SectionIndex++); + it->getSection().setOrdinal(SectionIndex++); } // Assign layout order indices to sections and fragments. diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp index cd175ad37ee..cd74b4800aa 100644 --- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp +++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp @@ -349,8 +349,8 @@ void AArch64MachObjectWriter::RecordRelocation( "'. Must have non-local symbol earlier in section."); // Adjust the relocation to be section-relative. // The index is the section ordinal (1-based). - const MCSectionData &SymSD = Asm.getSectionData(Symbol->getSection()); - Index = SymSD.getOrdinal() + 1; + const MCSection &Sec = Symbol->getSection(); + Index = Sec.getOrdinal() + 1; Value += Writer->getSymbolAddress(*Symbol, Layout); if (IsPCRel) diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp index d5f5f9a005f..84585b91390 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp @@ -19,6 +19,7 @@ #include "llvm/MC/MCFixupKindInfo.h" #include "llvm/MC/MCMachOSymbolFlags.h" #include "llvm/MC/MCMachObjectWriter.h" +#include "llvm/MC/MCSection.h" #include "llvm/MC/MCValue.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MachO.h" @@ -423,8 +424,9 @@ void ARMMachObjectWriter::RecordRelocation(MachObjectWriter *Writer, FixedValue -= Layout.getSymbolOffset(*A); } else { // The index is the section ordinal (1-based). - const MCSectionData &SymSD = Asm.getSectionData(A->getSection()); - Index = SymSD.getOrdinal() + 1; + const MCSection &Sec = A->getSection(); + const MCSectionData &SymSD = Asm.getSectionData(Sec); + Index = Sec.getOrdinal() + 1; FixedValue += Writer->getSectionAddress(&SymSD); } if (IsPCRel) diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp index 99bc56aeb48..1bdf031b81b 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp @@ -363,8 +363,9 @@ void PPCMachObjectWriter::RecordPPCRelocation( FixedValue -= Layout.getSymbolOffset(*A); } else { // The index is the section ordinal (1-based). - const MCSectionData &SymSD = Asm.getSectionData(A->getSection()); - Index = SymSD.getOrdinal() + 1; + const MCSection &Sec = A->getSection(); + const MCSectionData &SymSD = Asm.getSectionData(Sec); + Index = Sec.getOrdinal() + 1; FixedValue += Writer->getSectionAddress(&SymSD); } if (IsPCRel) diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp index b33852b4e25..e2d5ef20d4d 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp @@ -190,7 +190,7 @@ void X86MachObjectWriter::RecordX86_64Relocation( (!B_Base ? 0 : Writer->getSymbolAddress(*B_Base, Layout)); if (!A_Base) - Index = A_SD.getFragment()->getParent()->getOrdinal() + 1; + Index = A_SD.getFragment()->getParent()->getSection().getOrdinal() + 1; Type = MachO::X86_64_RELOC_UNSIGNED; MachO::any_relocation_info MRE; @@ -202,7 +202,7 @@ void X86MachObjectWriter::RecordX86_64Relocation( if (B_Base) RelSymbol = B_Base; else - Index = B_SD.getFragment()->getParent()->getOrdinal() + 1; + Index = B_SD.getFragment()->getParent()->getSection().getOrdinal() + 1; Type = MachO::X86_64_RELOC_SUBTRACTOR; } else { const MCSymbol *Symbol = &Target.getSymA()->getSymbol(); @@ -235,7 +235,7 @@ void X86MachObjectWriter::RecordX86_64Relocation( Layout.getSymbolOffset(*RelSymbol); } else if (Symbol->isInSection() && !Symbol->isVariable()) { // The index is the section ordinal (1-based). - Index = SD.getFragment()->getParent()->getOrdinal() + 1; + Index = SD.getFragment()->getParent()->getSection().getOrdinal() + 1; Value += Writer->getSymbolAddress(*Symbol, Layout); if (IsPCRel) @@ -554,8 +554,9 @@ void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer, FixedValue -= Layout.getSymbolOffset(*A); } else { // The index is the section ordinal (1-based). - const MCSectionData &SymSD = Asm.getSectionData(A->getSection()); - Index = SymSD.getOrdinal() + 1; + const MCSection &Sec = A->getSection(); + const MCSectionData &SymSD = Asm.getSectionData(Sec); + Index = Sec.getOrdinal() + 1; FixedValue += Writer->getSectionAddress(&SymSD); } if (IsPCRel) |
