commit | 2931c646d9f1a01cfa55584a1a467e3271e34830 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Apr 03 19:16:00 2024 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 03 19:16:00 2024 +0000 |
tree | eb8d1a5fe80b0d7325fe8d9de1a4ad228780cfa6 | |
parent | 74d67442a33e6f0509a205441647cd663fbe2903 [diff] | |
parent | 0e179328f9776553bd5f1891094d6cbcd019b574 [diff] |
Merge "Remove duplicate PT_ARM_EXIDX definition." into main
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index 49c3b57..ef7671c 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp
@@ -1280,11 +1280,6 @@ #if defined(__arm__) - -# ifndef PT_ARM_EXIDX -# define PT_ARM_EXIDX 0x70000001 /* .ARM.exidx segment */ -# endif - /* Return the address and size of the .ARM.exidx section in memory, * if present. *