generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1a88ca08: am 98c726ec: Merge "Add the dl_iterate_phdr function to libdl for arm."

Browse Source 
* commit '1a88ca08046ea510bfc8d3de6875537f124b3ce3':
  Add the dl_iterate_phdr function to libdl for arm.
This commit is contained in:
Christopher Ferris
2013-09-06 10:57:40 -07:00
committed by Android Git Automerger
parent a015800e73 1a88ca0804
commit 5cb0436930
5 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/arch-arm/arm.mk
View File

@@ -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.

4
libc/include/link.h
View File

@@ -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