commit 489a806965a0e0d599246c688538eb20c5bf58a2
author Rui Ueyama <ruiu@google.com> Thu Jan 14 20:53:50 2016 +0000
committer Rui Ueyama <ruiu@google.com> Thu Jan 14 20:53:50 2016 +0000
tree 9274e6a0a18df3348899c0a20c16b148a62cf5de
parent 791fd160c351fcfac1b4693f06499dde43175318

Update for LLVM function name change.

llvm-svn: 257801

lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 4ecfece..4a54e4b 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -255,7 +255,7 @@
 }
 
 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 @@
       if (isZeroFillSection(sect.type))
         _sectInfo[&sect].fileOffset = 0;
       else {
-        offset = llvm::RoundUpToAlignment(offset, sect.alignment);
+        offset = llvm::alignTo(offset, sect.alignment);
         _sectInfo[&sect].fileOffset = offset;
         offset += sect.content.size();
       }
@@ -539,10 +539,8 @@
                   << ", 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 @@
   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;