diff options
| author | Christopher Ferris <cferris@google.com> | 2013-08-19 17:45:09 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2013-09-06 09:53:54 -0700 |
| commit | 24053a461e7a20f34002262c1bb122023134989d (patch) | |
| tree | 5da0ad5fe8822190483226140c7fba6a9f618395 /libc | |
| parent | df7436e709035fb6f5667980042848c8b4ca3e79 (diff) | |
| download | bionic-24053a461e7a20f34002262c1bb122023134989d.zip bionic-24053a461e7a20f34002262c1bb122023134989d.tar.gz bionic-24053a461e7a20f34002262c1bb122023134989d.tar.bz2 | |
Add the dl_iterate_phdr function to libdl for arm.
Bug: 8410085
Merge from internal master.
(cherry-picked from cb491bc66dc0abc145930b09086eb9189a30f6c2)
Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-arm/arm.mk | 5 | ||||
| -rw-r--r-- | libc/include/link.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libc/arch-arm/arm.mk b/libc/arch-arm/arm.mk index e87ef38..5f2443f 100644 --- a/libc/arch-arm/arm.mk +++ b/libc/arch-arm/arm.mk @@ -21,10 +21,11 @@ _LIBC_ARCH_COMMON_SRC_FILES := \ # These are used by the static and dynamic versions of the libc # respectively. _LIBC_ARCH_STATIC_SRC_FILES := \ - arch-arm/bionic/exidx_static.c + arch-arm/bionic/exidx_static.c \ + bionic/dl_iterate_phdr_static.c \ _LIBC_ARCH_DYNAMIC_SRC_FILES := \ - arch-arm/bionic/exidx_dynamic.c + arch-arm/bionic/exidx_dynamic.c \ # Remove the C++ fortify function implementations for which there is an # arm assembler version. 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 @@ struct dl_phdr_info { 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 |