commit e20152dd369fc7191a607bdb807b37fc5a3f5399
author Suren Baghdasaryan <surenb@google.com> Mon Jul 29 21:35:55 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 29 21:35:55 2024 +0000
tree adcb2498ecb60fba44174ddfa284a9644b452a25
parent d4dbe8c5d52399c75a8af5f97a81de28d45b54a4
parent 1fb9272dc79ee2f1b44ed36dff3a0ede08f2f8c3

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

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3196061

Change-Id: Ib85296fcf214702ff821ff0c03b3b909c61a67a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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