commit 592061d8d00cf01dd1e314992f894432ba0646be
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 11 00:45:19 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 00:45:19 2024 +0000
tree 9846d6c8ba00ca90b555236ad19af0684f7e29ec
parent 5dabdf53b1c302098e701a2a728d31881e4afb17
parent 9d54591bddb167da5499170b77261f1a2f124adb

Merge "linker: say 2MiB in more readable fashion." into main am: 9d54591bdd

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

Change-Id: I6b03aa0f6167bce60673bbf51d475b7d5b452329
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 e5369ac..ec2d27f 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -628,7 +628,7 @@
   // Minimum alignment of shared library gap. For efficiency, this should match the second level
   // page size of the platform.
 #if defined(__LP64__)
-  constexpr size_t kGapAlignment = 1ul << 21;  // 2MB
+  constexpr size_t kGapAlignment = 2 * 1024 * 1024;
 #else
   constexpr size_t kGapAlignment = 0;
 #endif