commit 4041b13c204fc1e2fc799b67ce15347d9ad6c8d9
author Qiming Shi <qiming.shi@intel.com> Sun Jan 26 16:49:39 2014 +0800
committer Elliott Hughes <enh@google.com> Mon Jan 27 14:51:07 2014 -0800
tree 9b7fca4c64464af7e1c0292ecc41f84054055dba
parent 6f23ce36ce580da3c1419856c71d7426dd64748d

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 <qiming.shi@intel.com>
Signed-off-by: Weiwu Chen <weiwu.chen@intel.com>

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index b4d72b2..3101511 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -252,8 +252,8 @@
 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 @@
         }
     }
     if (!found_pt_load) {
-        min_vaddr = 0x00000000U;
+        min_vaddr = 0;
     }
 
     min_vaddr = PAGE_START(min_vaddr);