generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am da3c4f2f: Merge "Adjust DT_VERSYM/VERNEED/VERDEF dynamic sections"

Browse Source 
* commit 'da3c4f2f0d86b7e249c9b9b6cdf3bc0225b7178e':
  Adjust DT_VERSYM/VERNEED/VERDEF dynamic sections
This commit is contained in:
Dmitriy Ivanov 2015-04-21 23:08:41 +00:00 committed by Android Git Automerger
commit 2cfdac5cb2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/relocation_packer/src/elf_file.cc
View File

@ -439,6 +439,9 @@ void ElfFile<ELF>::AdjustDynamicSectionForHole(Elf_Scn* dynamic_section,
tag == DT_JMPREL || tag == DT_JMPREL ||
tag == DT_INIT_ARRAY || tag == DT_INIT_ARRAY ||
tag == DT_FINI_ARRAY || tag == DT_FINI_ARRAY ||
tag == DT_VERSYM ||
tag == DT_VERNEED ||
tag == DT_VERDEF ||
tag == DT_ANDROID_REL|| tag == DT_ANDROID_REL||
tag == DT_ANDROID_RELA); tag == DT_ANDROID_RELA);
@ -586,7 +589,7 @@ bool ElfFile<ELF>::PackRelocations() {
const typename ELF::Rel* relocations_base = reinterpret_cast<typename ELF::Rel*>(data->d_buf); const typename ELF::Rel* relocations_base = reinterpret_cast<typename ELF::Rel*>(data->d_buf);
ConvertRelArrayToRelaVector(relocations_base, ConvertRelArrayToRelaVector(relocations_base,
data->d_size / sizeof(typename ELF::Rel), &relocations); data->d_size / sizeof(typename ELF::Rel), &relocations);
LOG(INFO) << "Relocations : REL"; VLOG(1) << "Relocations : REL";
} else if (relocations_type_ == RELA) { } else if (relocations_type_ == RELA) {
// Convert data to a vector of relocations with addends. // Convert data to a vector of relocations with addends.
const typename ELF::Rela* relocations_base = reinterpret_cast<typename ELF::Rela*>(data->d_buf); const typename ELF::Rela* relocations_base = reinterpret_cast<typename ELF::Rela*>(data->d_buf);
@ -594,7 +597,7 @@ bool ElfFile<ELF>::PackRelocations() {
relocations_base, relocations_base,
relocations_base + data->d_size / sizeof(relocations[0])); relocations_base + data->d_size / sizeof(relocations[0]));
LOG(INFO) << "Relocations : RELA"; VLOG(1) << "Relocations : RELA";
} else { } else {
NOTREACHED(); NOTREACHED();
} }
@ -618,18 +621,18 @@ bool ElfFile<ELF>::PackTypedRelocations(std::vector<typename ELF::Rela>* relocat
relocations_type_ == RELA ? sizeof(typename ELF::Rela) : sizeof(typename ELF::Rel); relocations_type_ == RELA ? sizeof(typename ELF::Rela) : sizeof(typename ELF::Rel);
const size_t initial_bytes = relocations->size() * rel_size; const size_t initial_bytes = relocations->size() * rel_size;
LOG(INFO) << "Unpacked : " << initial_bytes << " bytes"; VLOG(1) << "Unpacked : " << initial_bytes << " bytes";
std::vector<uint8_t> packed; std::vector<uint8_t> packed;
RelocationPacker<ELF> packer; RelocationPacker<ELF> packer;
// Pack relocations: dry run to estimate memory savings. // Pack relocations: dry run to estimate memory savings.
packer.PackRelocations(*relocations, &packed); packer.PackRelocations(*relocations, &packed);
const size_t packed_bytes_estimate = packed.size() * sizeof(packed[0]); const size_t packed_bytes_estimate = packed.size() * sizeof(packed[0]);
LOG(INFO) << "Packed (no padding): " << packed_bytes_estimate << " bytes"; VLOG(1) << "Packed (no padding): " << packed_bytes_estimate << " bytes";
if (packed.empty()) { if (packed.empty()) {
LOG(INFO) << "Too few relocations to pack"; LOG(INFO) << "Too few relocations to pack";
return false; return true;
} }
// Pre-calculate the size of the hole we will close up when we rewrite // Pre-calculate the size of the hole we will close up when we rewrite
@ -646,7 +649,7 @@ bool ElfFile<ELF>::PackTypedRelocations(std::vector<typename ELF::Rela>* relocat
// Adjusting for alignment may have removed any packing benefit. // Adjusting for alignment may have removed any packing benefit.
if (hole_size == 0) { if (hole_size == 0) {
LOG(INFO) << "Too few relocations to pack after alignment"; LOG(INFO) << "Too few relocations to pack after alignment";
return false; return true;
} }
if (hole_size <= 0) { if (hole_size <= 0) {