Rename align2 -> align.

I believe "2" stands for log2. Just "align" would be appropriate now.

llvm-svn: 233248

2 files changed, 8 insertions, 8 deletions

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};