commit | 79bbed4bfed2e330df8964a92edbed10479e7c2e | [log] [tgz] |
---|---|---|
author | Christopher Ferris <cferris@google.com> | Mon Sep 23 20:09:39 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 23 20:09:39 2024 +0000 |
tree | 5680f37426f8faa0b487340bac5eac46fa9f2096 | |
parent | 853281094aed9feeca437dd7b264ec389c9b8b9d [diff] | |
parent | 5f386d5e22a9be328290bb12ae7bc2e13cc17031 [diff] |
Merge "Remove unused variable." into main am: 5f386d5e22 Original change: https://android-review.googlesource.com/c/platform/bionic/+/3272962 Change-Id: Ifeb4c986a31e675d2f9832401a748420a9d044db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index 48206be..b7db4cd 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp
@@ -976,7 +976,6 @@ ElfW(Addr) seg_start = phdr->p_vaddr + load_bias_; ElfW(Addr) seg_end = seg_start + p_memsz; - ElfW(Addr) seg_page_start = page_start(seg_start); ElfW(Addr) seg_page_end = page_end(seg_end); ElfW(Addr) seg_file_end = seg_start + p_filesz;