commit 2c80db1caf9f8c5c5589773282728c737c3b9494
author Andreas Gampe <agampe@google.com> Tue Jul 28 05:32:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 05:32:50 2015 +0000
tree f2da2183d342175f9d56063ebce900fbb4a3a7d1
parent eb1561a74a818821e5eeaf493471abfd237cb60d
parent 4036eb5020eac969286e0db51577ba0cd4c171c6

am 4036eb50: Libunwind: Remove unused variable

* commit '4036eb5020eac969286e0db51577ba0cd4c171c6':
  Libunwind: Remove unused variable

src/dwarf/Gfind_unwind_table.c

diff --git a/src/dwarf/Gfind_unwind_table.c b/src/dwarf/Gfind_unwind_table.c
index 52ded19..9de3ad5 100644
--- a/src/dwarf/Gfind_unwind_table.c
+++ b/src/dwarf/Gfind_unwind_table.c
@@ -130,7 +130,6 @@
   GET_EHDR_FIELD(ei, &ehdr, e_phoff, false);
   GET_EHDR_FIELD(ei, &ehdr, e_phnum, false);
 
-  Elf_W(Phdr) phdr;
   Elf_W(Off) offset = ehdr.e_phoff;
   Elf_W(Off) txt_phdr_offset = 0;
   Elf_W(Addr) txt_pvaddr = 0;
@@ -218,7 +217,7 @@
 #if UNW_TARGET_ARM
   // Verify that the map contains enough space for the arm unwind data.
   if (arm_exidx_phdr_offset &&
-    arm_exidx_phdr_offset + sizeof(phdr) < ei->u.memory.map->end - ei->u.memory.map->start) {
+    arm_exidx_phdr_offset + sizeof(Elf_W(Phdr)) < ei->u.memory.map->end - ei->u.memory.map->start) {
     Elf_W(Phdr) phdr;
     GET_PHDR_FIELD(ei, arm_exidx_phdr_offset, &phdr, p_vaddr);
     GET_PHDR_FIELD(ei, arm_exidx_phdr_offset, &phdr, p_memsz);