commit 24053a461e7a20f34002262c1bb122023134989d
author Christopher Ferris <cferris@google.com> Mon Aug 19 17:45:09 2013 -0700
committer Christopher Ferris <cferris@google.com> Fri Sep 06 09:53:54 2013 -0700
tree 5da0ad5fe8822190483226140c7fba6a9f618395
parent df7436e709035fb6f5667980042848c8b4ca3e79

Add the dl_iterate_phdr function to libdl for arm.

Bug: 8410085

Merge from internal master.

(cherry-picked from cb491bc66dc0abc145930b09086eb9189a30f6c2)

Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f

libc/include/link.h

diff --git a/libc/include/link.h b/libc/include/link.h
index 842b448..0edf5df 100644
--- a/libc/include/link.h
+++ b/libc/include/link.h
@@ -43,11 +43,11 @@
   ElfW(Half) dlpi_phnum;
 };
 
+int dl_iterate_phdr(int (*cb)(struct dl_phdr_info*, size_t, void*), void*);
+
 #ifdef __arm__
 typedef long unsigned int* _Unwind_Ptr;
 _Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int* pcount);
-#else
-int dl_iterate_phdr(int (*cb)(struct dl_phdr_info*, size_t, void*), void*);
 #endif
 
 __END_DECLS