| commit | cd6a99dee298db56f17a60cadc0abc18fd687375 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Sep 23 20:48:21 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 23 20:48:21 2024 +0000 |
| tree | 5680f37426f8faa0b487340bac5eac46fa9f2096 | |
| parent | c77a02362b4017dcd81f4f89f4b064a43196e276 [diff] | |
| parent | 79bbed4bfed2e330df8964a92edbed10479e7c2e [diff] |
Merge "Remove unused variable." into main am: 5f386d5e22 am: 79bbed4bfe Original change: https://android-review.googlesource.com/c/platform/bionic/+/3272962 Change-Id: I1440f352e7e1348f2aa2daec15987fab385481a8 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;