replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for llvm change. NFC. 

llvm-svn: 258080
This commit is contained in:
Rafael Espindola 2016-01-18 20:57:54 +00:00
parent a79078c3ce
commit a94ae1e05b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/Expression/IRMemoryMap.cpp
View File

@ -77,7 +77,7 @@ IRMemoryMap::FindSpace (size_t size, bool zero_memory)
auto back = m_allocations.rbegin(); auto back = m_allocations.rbegin();
lldb::addr_t addr = back->first; lldb::addr_t addr = back->first;
size_t alloc_size = back->second.m_size; size_t alloc_size = back->second.m_size;
ret = llvm::RoundUpToAlignment(addr+alloc_size, 4096); ret = llvm::alignTo(addr+alloc_size, 4096);
} }
return ret; return ret;

8
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@ -283,7 +283,7 @@ ELFNote::Parse(const DataExtractor &data, lldb::offset_t *offset)
} }
} }
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) if (cstr == NULL)
{ {
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS)); Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS));
@ -1449,7 +1449,7 @@ ObjectFileELF::RefineModuleDetailsFromNote (lldb_private::DataExtractor &data, l
// this ELF targets. // this ELF targets.
if(note.n_descsz) 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; (void)cstr;
} }
} }
@ -1635,7 +1635,7 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,
{ {
lldb::offset_t gnu_debuglink_offset = 0; lldb::offset_t gnu_debuglink_offset = 0;
gnu_debuglink_file = data.GetCStr (&gnu_debuglink_offset); 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); data.GetU32 (&gnu_debuglink_offset, &gnu_debuglink_crc, 1);
} }
} }
@ -2430,7 +2430,7 @@ GetPltEntrySizeAndOffset(const ELFSectionHeader* rel_hdr, const ELFSectionHeader
// Clang 3.3 sets entsize to 4 for 32-bit binaries, but the plt entries are 16 bytes. // 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. // So round the entsize up by the alignment if addralign is set.
elf_xword plt_entsize = plt_hdr->sh_addralign ? 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) if (plt_entsize == 0)
{ {

2
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
View File

@ -56,7 +56,7 @@ struct ELFNote
size_t size_t
GetByteSize() const 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);
} }
}; };

2
lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
View File

@ -517,7 +517,7 @@ ProcessElfCore::ParseThreadContextsFromNoteSegment(const elf::ELFProgramHeader *
size_t note_start, note_size; size_t note_start, note_size;
note_start = offset; note_start = offset;
note_size = llvm::RoundUpToAlignment(note.n_descsz, 4); note_size = llvm::alignTo(note.n_descsz, 4);
// Store the NOTE information in the current thread // Store the NOTE information in the current thread
DataExtractor note_data (segment_data, note_start, note_size); DataExtractor note_data (segment_data, note_start, note_size);