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

Merge "Count references for groups instead of instances"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2014-12-02 19:10:03 +00:00
committed by Gerrit Code Review
parent 46d0b81a94 ab972b9adf
commit 291dbf65ca
13 changed files with 407 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
linker/dlfcn.cpp
View File

@@ -236,16 +236,17 @@ static soinfo __libdl_info("libdl.so", nullptr, 0, RTLD_GLOBAL);
// This is used by the dynamic linker. Every process gets these symbols for free.
soinfo* get_libdl_info() {
if ((__libdl_info.flags & FLAG_LINKED) == 0) {
__libdl_info.flags |= FLAG_LINKED;
if ((__libdl_info.flags_ & FLAG_LINKED) == 0) {
__libdl_info.flags_ |= FLAG_LINKED;
__libdl_info.strtab_ = ANDROID_LIBDL_STRTAB;
__libdl_info.symtab_ = g_libdl_symtab;
__libdl_info.nbucket_ = sizeof(g_libdl_buckets)/sizeof(unsigned);
__libdl_info.nchain_ = sizeof(g_libdl_chains)/sizeof(unsigned);
__libdl_info.bucket_ = g_libdl_buckets;
__libdl_info.chain_ = g_libdl_chains;
__libdl_info.ref_count = 1;
__libdl_info.ref_count_ = 1;
__libdl_info.strtab_size_ = sizeof(ANDROID_LIBDL_STRTAB);
__libdl_info.local_group_root_ = &__libdl_info;
}
return &__libdl_info;