commit ba0c668feca851fd52359bee4174a232f27697b4
author Elliott Hughes <enh@google.com> Mon Jan 27 22:52:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 22:52:07 2014 +0000
tree 9b7fca4c64464af7e1c0292ecc41f84054055dba
parent 6f23ce36ce580da3c1419856c71d7426dd64748d
parent 4041b13c204fc1e2fc799b67ce15347d9ad6c8d9

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

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);