summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2015-03-26 02:23:45 +0000
committerRui Ueyama <ruiu@google.com>2015-03-26 02:23:45 +0000
commitda74d57edb7938828e39c8ceff60aa7b50cb7567 (patch)
tree3656fec818223c07cbf746f1cc9177b93d9d9de8 /lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
parent39eb6db9a56d8a970196ebecebf4c1ca7e917f3c (diff)
downloadbcm5719-llvm-da74d57edb7938828e39c8ceff60aa7b50cb7567.tar.gz
bcm5719-llvm-da74d57edb7938828e39c8ceff60aa7b50cb7567.zip
Rename align2 -> align.
I believe "2" stands for log2. Just "align" would be appropriate now. llvm-svn: 233248
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp')
-rw-r--r--lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp8
1 files changed, 4 insertions, 4 deletions
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};
OpenPOWER on IntegriCloud