Merge "Make dl_iterate_phdr weak in libdl." am: 36d5c54b5e
am: ba85d8beb7
Change-Id: I8b3e03c4217a8cb6547d7f4492b46a2a851c921c
This commit is contained in:
commit
67c8abfa9d
1 changed files with 5 additions and 0 deletions
|
@ -128,6 +128,11 @@ _Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int* pcount) {
|
|||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This needs to be defined as weak because it is also defined in libc.a.
|
||||
* Without this, static executables will have a multiple definition error.
|
||||
*/
|
||||
__attribute__((__weak__))
|
||||
int dl_iterate_phdr(int (*cb)(struct dl_phdr_info* info, size_t size, void* data), void* data) {
|
||||
return __loader_dl_iterate_phdr(cb, data);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue