commit 8a1162835597be38705b381ac34c07da17932568
author Dmitriy Ivanov <dimitry@google.com> Fri Jun 05 22:16:23 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Jun 09 13:44:31 2015 -0700
tree 13fb64618cf74789d9f47d7d438eda0e3fd27607
parent d9dc13d4172516342ceebf1b16624ed9fdf3fca2

Add flag that makes linker honor min(p_vaddr)

Bug: http://b/21523078
Change-Id: Ice72766fb6ad3bd333c32b496e7870121e17a763

libc/include/android/dlext.h

diff --git a/libc/include/android/dlext.h b/libc/include/android/dlext.h
index f10a8a2..40f610f 100644
--- a/libc/include/android/dlext.h
+++ b/libc/include/android/dlext.h
@@ -73,6 +73,13 @@
    */
   ANDROID_DLEXT_FORCE_LOAD = 0x40,
 
+  /* When set, if the minimum p_vaddr of the ELF file's PT_LOAD segments is non-zero,
+   * the dynamic linker will load it at that address.
+   *
+   * This flag is for ART internal use only.
+   */
+  ANDROID_DLEXT_FORCE_FIXED_VADDR = 0x80,
+
   /* Mask of valid bits */
   ANDROID_DLEXT_VALID_FLAG_BITS       = ANDROID_DLEXT_RESERVED_ADDRESS |
                                         ANDROID_DLEXT_RESERVED_ADDRESS_HINT |
@@ -80,7 +87,8 @@
                                         ANDROID_DLEXT_USE_RELRO |
                                         ANDROID_DLEXT_USE_LIBRARY_FD |
                                         ANDROID_DLEXT_USE_LIBRARY_FD_OFFSET |
-                                        ANDROID_DLEXT_FORCE_LOAD,
+                                        ANDROID_DLEXT_FORCE_LOAD |
+                                        ANDROID_DLEXT_FORCE_FIXED_VADDR,
 };
 
 typedef struct {