commit 1fb9272dc79ee2f1b44ed36dff3a0ede08f2f8c3
author Suren Baghdasaryan <surenb@google.com> Mon Jul 29 21:08:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 29 21:08:54 2024 +0000
tree adcb2498ecb60fba44174ddfa284a9644b452a25
parent 4c5fe985310f60c3bf12b9a3a853cce63963be39
parent 0aee1c038c1087b8f0b42f59a7f17b1df57192c7

Merge "Revert "linker: map the entire ELF file if address space is 64bit"" into main

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 1b51fcd..ad60efd 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -228,10 +228,8 @@
     return false;
   }
 
-#if !defined(__LP64__)
   // Map at most 1MiB which should cover most cases
   map_size = std::min(map_size, static_cast<size_t>(1 * 1024 * 1024));
-#endif
 
   if (!file_fragment_.Map(fd_, file_offset_, 0, map_size)) {
     DL_ERR("\"%s\" header mmap failed: %m", name_.c_str());