diff options
| -rw-r--r-- | third_party/android_crazy_linker/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/android_crazy_linker/README.chromium b/third_party/android_crazy_linker/README.chromium index fa9158e..655c069 100644 --- a/third_party/android_crazy_linker/README.chromium +++ b/third_party/android_crazy_linker/README.chromium @@ -76,3 +76,5 @@ Local Modifications: - Correct fix for crbug/479220 (replace IsSystemLibrary() with caller flags). +- Fix link_map_.l_addr (was load address, should be load bias). + diff --git a/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp b/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp index f4acadb..0bc3689 100644 --- a/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp +++ b/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp @@ -431,7 +431,7 @@ LibraryView* LibraryList::LoadLibrary(const char* lib_name, return NULL; // Notify GDB of load. - lib->link_map_.l_addr = lib->load_address(); + lib->link_map_.l_addr = lib->load_bias(); lib->link_map_.l_name = const_cast<char*>(lib->base_name_); lib->link_map_.l_ld = reinterpret_cast<uintptr_t>(lib->view_.dynamic()); Globals::GetRDebug()->AddEntry(&lib->link_map_); |