diff options
Diffstat (limited to 'lld/lib')
| -rw-r--r-- | lld/lib/Driver/DarwinLdDriver.cpp | 6 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 8 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp index f0ba2df178f..62afac8abb2 100644 --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -479,15 +479,15 @@ bool DarwinLdDriver::parse(int argc, const char *argv[], << alignStr << "' not a valid number\n"; return false; } - uint16_t align2 = 1 << llvm::countTrailingZeros(alignValue); + uint16_t align = 1 << llvm::countTrailingZeros(alignValue); if (!llvm::isPowerOf2_64(alignValue)) { diagnostics << "warning: alignment for '-sectalign " << segName << " " << sectName << llvm::format(" 0x%llX", alignValue) << "' is not a power of two, using " - << llvm::format("0x%08X", align2) << "\n"; + << llvm::format("0x%08X", align) << "\n"; } - ctx.addSectionAlignment(segName, sectName, align2); + ctx.addSectionAlignment(segName, sectName, align); } // Handle -mllvm diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index c8bf7a6f961..ef28c487593 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -731,16 +731,16 @@ ArchHandler &MachOLinkingContext::archHandler() const { void MachOLinkingContext::addSectionAlignment(StringRef seg, StringRef sect, - uint16_t align2) { - SectionAlign entry = { seg, sect, align2 }; + uint16_t align) { + SectionAlign entry = { seg, sect, align }; _sectAligns.push_back(entry); } bool MachOLinkingContext::sectionAligned(StringRef seg, StringRef sect, - uint16_t &align2) const { + uint16_t &align) const { for (const SectionAlign &entry : _sectAligns) { if (seg.equals(entry.segmentName) && sect.equals(entry.sectionName)) { - align2 = entry.align2; + align = entry.align; return true; } } diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp index 75cdaef22dd..0f02f76dd66 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp @@ -327,17 +327,17 @@ void Util::appendAtom(SectionInfo *sect, const DefinedAtom *atom) { // Figure out offset for atom in this section given alignment constraints. uint64_t offset = sect->size; DefinedAtom::Alignment atomAlign = atom->alignment(); - uint64_t align2 = atomAlign.value; + uint64_t align = atomAlign.value; uint64_t requiredModulus = atomAlign.modulus; - uint64_t currentModulus = (offset % align2); + uint64_t currentModulus = (offset % align); if ( currentModulus != requiredModulus ) { if ( requiredModulus > currentModulus ) offset += requiredModulus-currentModulus; else - offset += align2+requiredModulus-currentModulus; + offset += align+requiredModulus-currentModulus; } // Record max alignment of any atom in this section. - if (align2 > sect->alignment) + if (align > sect->alignment) sect->alignment = atomAlign.value; // Assign atom to this section with this offset. AtomInfo ai = {atom, offset}; |
