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

am aea393c0: Merge "Remove has_DT_SYMBOLIC flag"

Browse Source 
* commit 'aea393c096460669647acbe803617affc5bc0697':
  Remove has_DT_SYMBOLIC flag
This commit is contained in:
Dmitriy Ivanov
2014-09-16 22:54:00 +00:00
committed by Android Git Automerger
parent 67c12a8392 aea393c096
commit 7ccb499c63
3 changed files with 40 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
linker/dlfcn.cpp
View File

@@ -244,7 +244,6 @@ soinfo* get_libdl_info() {
__libdl_info.nchain = sizeof(g_libdl_chains)/sizeof(unsigned); __libdl_info.nchain = sizeof(g_libdl_chains)/sizeof(unsigned);
__libdl_info.bucket = g_libdl_buckets; __libdl_info.bucket = g_libdl_buckets;
__libdl_info.chain = g_libdl_chains; __libdl_info.chain = g_libdl_chains;
__libdl_info.has_DT_SYMBOLIC = true;
__libdl_info.ref_count = 1; __libdl_info.ref_count = 1;
} }

131
linker/linker.cpp
View File

@@ -486,117 +486,65 @@ static ElfW(Sym)* soinfo_do_lookup(soinfo* si, const char* name, soinfo** lsi) {
ElfW(Sym)* s = nullptr; ElfW(Sym)* s = nullptr;
if (somain != nullptr) { if (somain != nullptr) {
/* DEBUG("%s: looking up %s in executable %s",
* Local scope is executable scope. Just start looking into it right away si->name, name, somain->name);
* for the shortcut.
*/
if (si == somain) { // 1. Look for it in the main executable
s = soinfo_elf_lookup(si, elf_hash, name); s = soinfo_elf_lookup(somain, elf_hash, name);
if (s != nullptr) { if (s != nullptr) {
*lsi = si; *lsi = somain;
goto done; }
}
/* Next, look for it in the preloads list */ // 2. Look for it in the ld_preloads
if (s == nullptr) {
for (int i = 0; g_ld_preloads[i] != NULL; i++) { for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name); s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != NULL) {
*lsi = g_ld_preloads[i];
goto done;
}
}
} else {
/* Order of symbol lookup is controlled by DT_SYMBOLIC flag */
/*
* If this object was built with symbolic relocations disabled, the
* first place to look to resolve external references is the main
* executable.
*/
if (!si->has_DT_SYMBOLIC) {
DEBUG("%s: looking up %s in executable %s",
si->name, name, somain->name);
s = soinfo_elf_lookup(somain, elf_hash, name);
if (s != nullptr) { if (s != nullptr) {
*lsi = somain; *lsi = g_ld_preloads[i];
goto done; break;
}
/* Next, look for it in the preloads list */
for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != NULL) {
*lsi = g_ld_preloads[i];
goto done;
}
} }
} }
}
/* Look for symbols in the local scope (the object who is /* Look for symbols in the local scope (the object who is
* searching). This happens with C++ templates on x86 for some * searching). This happens with C++ templates on x86 for some
* reason. * reason.
* *
* Notes on weak symbols: * Notes on weak symbols:
* The ELF specs are ambiguous about treatment of weak definitions in * The ELF specs are ambiguous about treatment of weak definitions in
* dynamic linking. Some systems return the first definition found * dynamic linking. Some systems return the first definition found
* and some the first non-weak definition. This is system dependent. * and some the first non-weak definition. This is system dependent.
* Here we return the first definition found for simplicity. */ * Here we return the first definition found for simplicity. */
if (s == nullptr) {
s = soinfo_elf_lookup(si, elf_hash, name); s = soinfo_elf_lookup(si, elf_hash, name);
if (s != nullptr) { if (s != nullptr) {
*lsi = si; *lsi = si;
goto done;
}
/*
* If this object was built with -Bsymbolic and symbol is not found
* in the local scope, try to find the symbol in the main executable.
*/
if (si->has_DT_SYMBOLIC) {
DEBUG("%s: looking up %s in executable %s after local scope",
si->name, name, somain->name);
s = soinfo_elf_lookup(somain, elf_hash, name);
if (s != nullptr) {
*lsi = somain;
goto done;
}
/* Next, look for it in the preloads list */
for (int i = 0; g_ld_preloads[i] != NULL; i++) {
s = soinfo_elf_lookup(g_ld_preloads[i], elf_hash, name);
if (s != NULL) {
*lsi = g_ld_preloads[i];
goto done;
}
}
} }
} }
} }
si->get_children().visit([&](soinfo* child) { if (s == nullptr) {
DEBUG("%s: looking up %s in %s", si->name, name, child->name); si->get_children().visit([&](soinfo* child) {
s = soinfo_elf_lookup(child, elf_hash, name); DEBUG("%s: looking up %s in %s", si->name, name, child->name);
if (s != nullptr) { s = soinfo_elf_lookup(child, elf_hash, name);
*lsi = child; if (s != nullptr) {
return false; *lsi = child;
} return false;
return true; }
}); return true;
});
}
done:
if (s != nullptr) { if (s != nullptr) {
TRACE_TYPE(LOOKUP, "si %s sym %s s->st_value = %p, " TRACE_TYPE(LOOKUP, "si %s sym %s s->st_value = %p, "
"found in %s, base = %p, load bias = %p", "found in %s, base = %p, load bias = %p",
si->name, name, reinterpret_cast<void*>(s->st_value), si->name, name, reinterpret_cast<void*>(s->st_value),
(*lsi)->name, reinterpret_cast<void*>((*lsi)->base), (*lsi)->name, reinterpret_cast<void*>((*lsi)->base),
reinterpret_cast<void*>((*lsi)->load_bias)); reinterpret_cast<void*>((*lsi)->load_bias));
return s;
} }
return nullptr; return s;
} }
// Each size has it's own allocator. // Each size has it's own allocator.
@@ -2026,7 +1974,7 @@ bool soinfo::PrelinkImage() {
break; break;
#endif #endif
case DT_SYMBOLIC: case DT_SYMBOLIC:
has_DT_SYMBOLIC = true; // ignored
break; break;
case DT_NEEDED: case DT_NEEDED:
++needed_count; ++needed_count;
@@ -2040,9 +1988,6 @@ bool soinfo::PrelinkImage() {
has_text_relocations = true; has_text_relocations = true;
#endif #endif
} }
if (d->d_un.d_val & DF_SYMBOLIC) {
has_DT_SYMBOLIC = true;
}
break; break;
#if defined(__mips__) #if defined(__mips__)
case DT_STRSZ: case DT_STRSZ:
@@ -2076,8 +2021,10 @@ bool soinfo::PrelinkImage() {
#endif #endif
default: default:
DEBUG("Unused DT entry: type %p arg %p", if (!relocating_linker) {
reinterpret_cast<void*>(d->d_tag), reinterpret_cast<void*>(d->d_un.d_val)); DL_WARN("%s: unused DT entry: type %p arg %p", name,
reinterpret_cast<void*>(d->d_tag), reinterpret_cast<void*>(d->d_un.d_val));
}
break; break;
} }
} }

4
linker/linker.h
View File

@@ -197,9 +197,7 @@ struct soinfo {
#if !defined(__LP64__) #if !defined(__LP64__)
bool has_text_relocations; bool has_text_relocations;
#endif #endif
// TODO: remove this flag, dynamic linker bool unused4; // DO NOT USE, maintained for compatibility
// should not use it in any way.
bool has_DT_SYMBOLIC;
soinfo(const char* name, const struct stat* file_stat, int rtld_flags); soinfo(const char* name, const struct stat* file_stat, int rtld_flags);