diff options
author | Rui Ueyama <ruiu@google.com> | 2016-01-14 20:53:50 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2016-01-14 20:53:50 +0000 |
commit | 489a806965a0e0d599246c688538eb20c5bf58a2 (patch) | |
tree | 9274e6a0a18df3348899c0a20c16b148a62cf5de /lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp | |
parent | 791fd160c351fcfac1b4693f06499dde43175318 (diff) | |
download | bcm5719-llvm-489a806965a0e0d599246c688538eb20c5bf58a2.tar.gz bcm5719-llvm-489a806965a0e0d599246c688538eb20c5bf58a2.zip |
Update for LLVM function name change.
llvm-svn: 257801
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp')
-rw-r--r-- | lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp index 4ecfece0629..4a54e4bb727 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp @@ -255,7 +255,7 @@ StringRef MachOFileLayout::dyldPath() { } uint32_t MachOFileLayout::pointerAlign(uint32_t value) { - return llvm::RoundUpToAlignment(value, _is64 ? 8 : 4); + return llvm::alignTo(value, _is64 ? 8 : 4); } @@ -292,7 +292,7 @@ MachOFileLayout::MachOFileLayout(const NormalizedFile &file) if (isZeroFillSection(sect.type)) _sectInfo[§].fileOffset = 0; else { - offset = llvm::RoundUpToAlignment(offset, sect.alignment); + offset = llvm::alignTo(offset, sect.alignment); _sectInfo[§].fileOffset = offset; offset += sect.content.size(); } @@ -539,10 +539,8 @@ void MachOFileLayout::buildFileOffsets() { << ", fileOffset=" << fileOffset << "\n"); } - _segInfo[&sg].fileSize = llvm::RoundUpToAlignment(segFileSize, - _file.pageSize); - fileOffset = llvm::RoundUpToAlignment(fileOffset + segFileSize, - _file.pageSize); + _segInfo[&sg].fileSize = llvm::alignTo(segFileSize, _file.pageSize); + fileOffset = llvm::alignTo(fileOffset + segFileSize, _file.pageSize); _addressOfLinkEdit = sg.address + sg.size; } _startOfLinkEdit = fileOffset; @@ -679,7 +677,7 @@ std::error_code MachOFileLayout::writeSegmentLoadCommands(uint8_t *&lc) { uint8_t *next = lc + cmd->cmdsize; setString16("__LINKEDIT", cmd->segname); cmd->vmaddr = _addressOfLinkEdit; - cmd->vmsize = llvm::RoundUpToAlignment(linkeditSize, _file.pageSize); + cmd->vmsize = llvm::alignTo(linkeditSize, _file.pageSize); cmd->fileoff = _startOfLinkEdit; cmd->filesize = linkeditSize; cmd->maxprot = VM_PROT_READ; |