diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2015-01-22 16:04:25 -0800 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2015-01-22 16:33:30 -0800 |
commit | 1649e7ee5b9bb4122be67903d55c4c8cc0549bba (patch) | |
tree | 9213c9213ccfad39b4c944ede78315f50684305a /linker/linker_phdr.cpp | |
parent | ae095a730d6b3af69dc5eff662c5609cde6f5d70 (diff) | |
download | bionic-1649e7ee5b9bb4122be67903d55c4c8cc0549bba.tar.gz |
Enable -Wold-style-cast warnings for linker
And fix old style casts.
Change-Id: I37e7a3e3fd852528ea76f02d967c7bd8cd5b06c9
Diffstat (limited to 'linker/linker_phdr.cpp')
-rw-r--r-- | linker/linker_phdr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index ffd4de28a..af4dc2567 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp @@ -688,7 +688,7 @@ int phdr_table_map_gnu_relro(const ElfW(Phdr)* phdr_table, size_t phdr_count, El */ int phdr_table_get_arm_exidx(const ElfW(Phdr)* phdr_table, size_t phdr_count, ElfW(Addr) load_bias, - ElfW(Addr)** arm_exidx, unsigned* arm_exidx_count) { + ElfW(Addr)** arm_exidx, size_t* arm_exidx_count) { const ElfW(Phdr)* phdr = phdr_table; const ElfW(Phdr)* phdr_limit = phdr + phdr_count; @@ -698,7 +698,7 @@ int phdr_table_get_arm_exidx(const ElfW(Phdr)* phdr_table, size_t phdr_count, } *arm_exidx = reinterpret_cast<ElfW(Addr)*>(load_bias + phdr->p_vaddr); - *arm_exidx_count = (unsigned)(phdr->p_memsz / 8); + *arm_exidx_count = phdr->p_memsz / 8; return 0; } *arm_exidx = nullptr; @@ -757,7 +757,7 @@ bool ElfReader::FindPhdr() { ElfW(Addr) elf_addr = load_bias_ + phdr->p_vaddr; const ElfW(Ehdr)* ehdr = reinterpret_cast<const ElfW(Ehdr)*>(elf_addr); ElfW(Addr) offset = ehdr->e_phoff; - return CheckPhdr((ElfW(Addr))ehdr + offset); + return CheckPhdr(reinterpret_cast<ElfW(Addr)>(ehdr) + offset); } break; } |