commit b2e6d4e4c5f37f9677ae7aed00a8f2cbeca165e3
author Dan Albert <danalbert@google.com> Wed Feb 07 20:27:10 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 07 20:27:10 2018 +0000
tree e72e40b505fe0646b04a2fbe20071c33c21fffe7
parent 4279b990599605d1ec7402ec61166fe4bbbf1aad
parent 4067bf9e3ac3e160a333e62d21aac2350b07b61c

Merge "Fix __gnu_Unwind_Find_exidx again." am: 1a5737a48f
am: 4067bf9e3a

Change-Id: Ibc27372557f97f9262bcfcfb6a189807ed046c09

libc/arch-arm/bionic/exidx_static.c

diff --git a/libc/arch-arm/bionic/exidx_static.c b/libc/arch-arm/bionic/exidx_static.c
index 1686d6a..ef3745f 100644
--- a/libc/arch-arm/bionic/exidx_static.c
+++ b/libc/arch-arm/bionic/exidx_static.c
@@ -35,10 +35,15 @@
  * EXIDX section.
  */
 
-extern unsigned __exidx_end;
-extern unsigned __exidx_start;
+struct exidx_entry {
+  uint32_t key;
+  uint32_t value;
+};
+
+extern struct exidx_entry __exidx_end;
+extern struct exidx_entry __exidx_start;
 
 _Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr pc __attribute__((unused)), int* pcount) {
-  *pcount = (&__exidx_end - &__exidx_start) / 8;
+  *pcount = (&__exidx_end - &__exidx_start);
   return (_Unwind_Ptr)&__exidx_start;
 }