diff options
| author | Ryan Prichard <rprichard@google.com> | 2019-10-30 20:49:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-30 20:49:07 +0000 |
| commit | 859202c8e527f5de5840a52c1630b90042a7e219 (patch) | |
| tree | ce02f4ab8fbc52194b05376d8db4cbe44e70974f /linker/linker.cpp | |
| parent | 1d81be51d87626269dd277875d696ea46c9e6b1a (diff) | |
| parent | 78cd2834807c0fbf5788b68ba96675ef79dd5920 (diff) | |
Merge "linker: remove COUNT_PAGES"
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index c1bccfe12..eedce7029 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -301,10 +301,6 @@ void count_relocation(RelocationKind) { } #endif -#if COUNT_PAGES -uint32_t bitmask[4096]; -#endif - static void notify_gdb_of_load(soinfo* info) { if (info->is_linker() || info->is_main_executable()) { // gdb already knows about the linker and the main executable. @@ -3140,7 +3136,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r switch (type) { case R_GENERIC_JUMP_SLOT: count_relocation(kRelocAbsolute); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO JMP_SLOT %16p <- %16p %s\n", reinterpret_cast<void*>(reloc), reinterpret_cast<void*>(sym_addr + addend), sym_name); @@ -3150,7 +3145,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r case R_GENERIC_ABSOLUTE: case R_GENERIC_GLOB_DAT: count_relocation(kRelocAbsolute); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO ABSOLUTE/GLOB_DAT %16p <- %16p %s\n", reinterpret_cast<void*>(reloc), reinterpret_cast<void*>(sym_addr + addend), sym_name); @@ -3158,7 +3152,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r break; case R_GENERIC_RELATIVE: count_relocation(kRelocRelative); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO RELATIVE %16p <- %16p\n", reinterpret_cast<void*>(reloc), reinterpret_cast<void*>(load_bias + addend)); @@ -3166,7 +3159,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r break; case R_GENERIC_IRELATIVE: count_relocation(kRelocRelative); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO IRELATIVE %16p <- %16p\n", reinterpret_cast<void*>(reloc), reinterpret_cast<void*>(load_bias + addend)); @@ -3210,7 +3202,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r return false; case R_GENERIC_TLS_TPREL: count_relocation(kRelocRelative); - MARK(rel->r_offset); { ElfW(Addr) tpoff = 0; if (lsi == nullptr) { @@ -3236,7 +3227,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r break; case R_GENERIC_TLS_DTPMOD: count_relocation(kRelocRelative); - MARK(rel->r_offset); { size_t module_id = 0; if (lsi == nullptr) { @@ -3252,7 +3242,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r break; case R_GENERIC_TLS_DTPREL: count_relocation(kRelocRelative); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO TLS_DTPREL %16p <- %16p %s\n", reinterpret_cast<void*>(reloc), reinterpret_cast<void*>(sym_addr + addend), sym_name); @@ -3264,7 +3253,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r // other architectures, as long as the resolver functions are implemented. case R_GENERIC_TLSDESC: count_relocation(kRelocRelative); - MARK(rel->r_offset); { TlsDescriptor* desc = reinterpret_cast<TlsDescriptor*>(reloc); if (lsi == nullptr) { @@ -3305,14 +3293,12 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r #if defined(__x86_64__) case R_X86_64_32: count_relocation(kRelocAbsolute); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO R_X86_64_32 %08zx <- +%08zx %s", static_cast<size_t>(reloc), static_cast<size_t>(sym_addr), sym_name); *reinterpret_cast<Elf32_Addr*>(reloc) = sym_addr + addend; break; case R_X86_64_PC32: count_relocation(kRelocRelative); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO R_X86_64_PC32 %08zx <- +%08zx (%08zx - %08zx) %s", static_cast<size_t>(reloc), static_cast<size_t>(sym_addr - reloc), static_cast<size_t>(sym_addr), static_cast<size_t>(reloc), sym_name); @@ -3321,7 +3307,6 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r #elif defined(__i386__) case R_386_PC32: count_relocation(kRelocRelative); - MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO R_386_PC32 %08x <- +%08x (%08x - %08x) %s", reloc, (sym_addr - reloc), sym_addr, reloc, sym_name); *reinterpret_cast<ElfW(Addr)*>(reloc) += (sym_addr - reloc); |