From 4041b13c204fc1e2fc799b67ce15347d9ad6c8d9 Mon Sep 17 00:00:00 2001 From: Qiming Shi Date: Sun, 26 Jan 2014 16:49:39 +0800 Subject: [PATCH] bionic: Do not use magic number for portability Do not use the magic number 0xFFFFFFFFU to represent the max value of an address as it's not correct on 64bit platform. We should use UINTPTR_MAX instead. Change-Id: I1fc6f5864a651b2eddea2333cb0788f9d9223270 Signed-off-by: Qiming Shi Signed-off-by: Weiwu Chen --- linker/linker_phdr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index b4d72b27d..310151199 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp @@ -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);