am ba0c668f: Merge "bionic: Do not use magic number for portability"

* commit 'ba0c668feca851fd52359bee4174a232f27697b4':
  bionic: Do not use magic number for portability
This commit is contained in:
Elliott Hughes 2014-01-27 14:57:53 -08:00 committed by Android Git Automerger
commit cbb439addb

View File

@ -252,8 +252,8 @@ bool ElfReader::ReadProgramHeader() {
size_t phdr_table_get_load_size(const Elf_Phdr* phdr_table, size_t phdr_count,
Elf_Addr* out_min_vaddr,
Elf_Addr* out_max_vaddr) {
Elf_Addr min_vaddr = 0xFFFFFFFFU;
Elf_Addr max_vaddr = 0x00000000U;
Elf_Addr min_vaddr = UINTPTR_MAX;
Elf_Addr max_vaddr = 0;
bool found_pt_load = false;
for (size_t i = 0; i < phdr_count; ++i) {
@ -273,7 +273,7 @@ size_t phdr_table_get_load_size(const Elf_Phdr* phdr_table, size_t phdr_count,
}
}
if (!found_pt_load) {
min_vaddr = 0x00000000U;
min_vaddr = 0;
}
min_vaddr = PAGE_START(min_vaddr);