diff options
| -rw-r--r-- | lld/ELF/InputSection.cpp | 10 | ||||
| -rw-r--r-- | lld/ELF/InputSection.h | 4 | ||||
| -rw-r--r-- | lld/ELF/SyntheticSections.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp index 34c6345c531..027ade90310 100644 --- a/lld/ELF/InputSection.cpp +++ b/lld/ELF/InputSection.cpp @@ -53,7 +53,7 @@ static ArrayRef<uint8_t> getSectionContents(elf::ObjectFile<ELFT> *File, InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags, uint32_t Type, uint64_t Entsize, uint32_t Link, uint32_t Info, - uint64_t Addralign, ArrayRef<uint8_t> Data, + uint64_t Alignment, ArrayRef<uint8_t> Data, StringRef Name, Kind SectionKind) : File(File), Data(Data), Name(Name), SectionKind(SectionKind), Live(!Config->GcSections || !(Flags & SHF_ALLOC)), Assigned(false), @@ -64,7 +64,7 @@ InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags, // The ELF spec states that a value of 0 means the section has // no alignment constraits. - uint64_t V = std::max<uint64_t>(Addralign, 1); + uint64_t V = std::max<uint64_t>(Alignment, 1); if (!isPowerOf2_64(V)) fatal(toString(File) + ": section sh_addralign is not a power of 2"); @@ -73,7 +73,7 @@ InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags, // We might want to relax this in the future. if (V > UINT32_MAX) fatal(toString(File) + ": section sh_addralign is too large"); - Alignment = V; + this->Alignment = V; } template <class ELFT> @@ -188,10 +188,10 @@ std::string InputSectionBase::getLocation(uint64_t Offset) { InputSectionBase InputSectionBase::Discarded; -InputSection::InputSection(uint64_t Flags, uint32_t Type, uint64_t Addralign, +InputSection::InputSection(uint64_t Flags, uint32_t Type, uint64_t Alignment, ArrayRef<uint8_t> Data, StringRef Name, Kind K) : InputSectionBase(nullptr, Flags, Type, - /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, Addralign, Data, + /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, Alignment, Data, Name, K) {} template <class ELFT> diff --git a/lld/ELF/InputSection.h b/lld/ELF/InputSection.h index 63af8baa986..a9ef978e526 100644 --- a/lld/ELF/InputSection.h +++ b/lld/ELF/InputSection.h @@ -78,7 +78,7 @@ public: InputSectionBase(InputFile *File, uint64_t Flags, uint32_t Type, uint64_t Entsize, uint32_t Link, uint32_t Info, - uint64_t Addralign, ArrayRef<uint8_t> Data, StringRef Name, + uint64_t Alignment, ArrayRef<uint8_t> Data, StringRef Name, Kind SectionKind); OutputSection *OutSec = nullptr; @@ -252,7 +252,7 @@ public: // .eh_frame. It also includes the synthetic sections themselves. class InputSection : public InputSectionBase { public: - InputSection(uint64_t Flags, uint32_t Type, uint64_t Addralign, + InputSection(uint64_t Flags, uint32_t Type, uint64_t Alignment, ArrayRef<uint8_t> Data, StringRef Name, Kind K = Regular); template <class ELFT> InputSection(ObjectFile<ELFT> *F, const typename ELFT::Shdr *Header, diff --git a/lld/ELF/SyntheticSections.h b/lld/ELF/SyntheticSections.h index f5d6078f448..0b0dcd67d53 100644 --- a/lld/ELF/SyntheticSections.h +++ b/lld/ELF/SyntheticSections.h @@ -32,9 +32,9 @@ namespace elf { class SyntheticSection : public InputSection { public: - SyntheticSection(uint64_t Flags, uint32_t Type, uint64_t Addralign, + SyntheticSection(uint64_t Flags, uint32_t Type, uint64_t Alignment, StringRef Name) - : InputSection(Flags, Type, Addralign, {}, Name, + : InputSection(Flags, Type, Alignment, {}, Name, InputSectionBase::Synthetic) { this->Live = true; } |
