commit a94ae1e05ba3aeb57bc750ca24b11e5923d0a597
author Rafael Espindola <rafael.espindola@gmail.com> Mon Jan 18 20:57:54 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Jan 18 20:57:54 2016 +0000
tree 0054d49d78ef43b5bc3ba33a502c0e5e14eab77e
parent a79078c3cefa3923887f9f94632a124ce4c85bed

Update for llvm change. NFC.

llvm-svn: 258080

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index b16a2cd..ea7c064 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -283,7 +283,7 @@
         }
     }
 
-    const char *cstr = data.GetCStr(offset, llvm::RoundUpToAlignment (n_namesz, 4));
+    const char *cstr = data.GetCStr(offset, llvm::alignTo (n_namesz, 4));
     if (cstr == NULL)
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS));
@@ -1449,7 +1449,7 @@
             // this ELF targets.
             if(note.n_descsz)
             {
-                const char *cstr = data.GetCStr(&offset, llvm::RoundUpToAlignment (note.n_descsz, 4));
+                const char *cstr = data.GetCStr(&offset, llvm::alignTo (note.n_descsz, 4));
                 (void)cstr;
             }
         }
@@ -1635,7 +1635,7 @@
                     {
                         lldb::offset_t gnu_debuglink_offset = 0;
                         gnu_debuglink_file = data.GetCStr (&gnu_debuglink_offset);
-                        gnu_debuglink_offset = llvm::RoundUpToAlignment (gnu_debuglink_offset, 4);
+                        gnu_debuglink_offset = llvm::alignTo (gnu_debuglink_offset, 4);
                         data.GetU32 (&gnu_debuglink_offset, &gnu_debuglink_crc, 1);
                     }
                 }
@@ -2430,7 +2430,7 @@
     // Clang 3.3 sets entsize to 4 for 32-bit binaries, but the plt entries are 16 bytes.
     // So round the entsize up by the alignment if addralign is set.
     elf_xword plt_entsize = plt_hdr->sh_addralign ?
-        llvm::RoundUpToAlignment (plt_hdr->sh_entsize, plt_hdr->sh_addralign) : plt_hdr->sh_entsize;
+        llvm::alignTo (plt_hdr->sh_entsize, plt_hdr->sh_addralign) : plt_hdr->sh_entsize;
 
     if (plt_entsize == 0)
     {

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h

diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
index 4b97f92..8c5a003 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
@@ -56,7 +56,7 @@
     size_t
     GetByteSize() const
     {
-        return 12 + llvm::RoundUpToAlignment (n_namesz, 4) + llvm::RoundUpToAlignment (n_descsz, 4);
+        return 12 + llvm::alignTo (n_namesz, 4) + llvm::alignTo (n_descsz, 4);
     }
 };