commit 3d2bc5d6c8f08e587a8dad848829f98776549ba6
author Colin Cross <ccross@android.com> Tue May 20 23:03:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 20 23:03:07 2014 +0000
tree 126e8280445807a73bd9793bdb8babd948573bad
parent afb89c2a01089bb247456634a15a58f111bb55a6
parent 346fea0805b8c2a20171c9b4ab1aac5f66ede5de

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

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 8ef1212..7e3b3f4 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -102,7 +102,7 @@
   ElfW(Sym)* sym = NULL;
   if (handle == RTLD_DEFAULT) {
     sym = dlsym_linear_lookup(symbol, &found, NULL);
-  } else if (handle == RTLD_NEXT) {
+  } else if (handle == RTLD_NEXT || handle == (void*)0xffffffffL) {
     void* caller_addr = __builtin_return_address(0);
     soinfo* si = find_containing_library(caller_addr);