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

am ddc44974: Merge "Revert "HACK: linker: check for handle==0xffffffff on LP64""

Browse Source 
* commit 'ddc449748bc3ff0ba574be00f4bbac9fba242e33':
  Revert "HACK: linker: check for handle==0xffffffff on LP64"
This commit is contained in:
Colin Cross 2014-06-28 00:49:03 +00:00 committed by Android Git Automerger
commit 26dde2d2e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker/dlfcn.cpp
View File

@ -100,9 +100,9 @@ void* dlsym(void* handle, const char* symbol) {
soinfo* found = NULL; soinfo* found = NULL;
ElfW(Sym)* sym = NULL; ElfW(Sym)* sym = NULL;
if (handle == RTLD_DEFAULT || handle == (void*)0xffffffffL) { if (handle == RTLD_DEFAULT) {
sym = dlsym_linear_lookup(symbol, &found, NULL); sym = dlsym_linear_lookup(symbol, &found, NULL);
} else if (handle == RTLD_NEXT || handle == (void*)0xfffffffeL) { } else if (handle == RTLD_NEXT) {
void* caller_addr = __builtin_return_address(0); void* caller_addr = __builtin_return_address(0);
soinfo* si = find_containing_library(caller_addr); soinfo* si = find_containing_library(caller_addr);