Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-10-10 21:04:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update for llvm change.

Browse Source 
llvm-svn: 283267
This commit is contained in:
Rafael Espindola 2016-10-04 22:43:38 +00:00
parent 39751afc4e
commit 259d645147
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/ELFCreator.cpp
View File

@ -100,10 +100,8 @@ template <class ELFT> std::size_t ELFCreator<ELFT>::layout() {
template <class ELFT> void ELFCreator<ELFT>::write(uint8_t *Out) {
std::memcpy(Out, &Header, sizeof(Elf_Ehdr));
std::copy(SecHdrStrTabBuilder.data().begin(),
SecHdrStrTabBuilder.data().end(), Out + ShStrTab->sh_offset);
std::copy(StrTabBuilder.data().begin(), StrTabBuilder.data().end(),
Out + StrTab->sh_offset);
SecHdrStrTabBuilder.write(Out + ShStrTab->sh_offset);
StrTabBuilder.write(Out + StrTab->sh_offset);
Elf_Sym *Sym = reinterpret_cast<Elf_Sym *>(Out + SymTab->sh_offset);
// Skip null.

12
lld/ELF/OutputSections.cpp
View File

@ -1222,15 +1222,7 @@ MergeOutputSection<ELFT>::MergeOutputSection(StringRef Name, uint32_t Type,
Builder(StringTableBuilder::RAW, Alignment) {}
template <class ELFT> void MergeOutputSection<ELFT>::writeTo(uint8_t *Buf) {
if (shouldTailMerge()) {
StringRef Data = Builder.data();
memcpy(Buf, Data.data(), Data.size());
return;
}
for (const std::pair<CachedHash<StringRef>, size_t> &P : Builder.getMap()) {
StringRef Data = P.first.Val;
memcpy(Buf + P.second, Data.data(), Data.size());
}
Builder.write(Buf);
}
static StringRef toStringRef(ArrayRef<uint8_t> A) {
@ -1268,6 +1260,8 @@ template <class ELFT> bool MergeOutputSection<ELFT>::shouldTailMerge() const {
template <class ELFT> void MergeOutputSection<ELFT>::finalize() {
if (shouldTailMerge())
Builder.finalize();
else
Builder.finalizeInOrder();
this->Header.sh_size = Builder.getSize();
}