commit ddc449748bc3ff0ba574be00f4bbac9fba242e33
author Colin Cross <ccross@android.com> Sat Jun 28 00:39:33 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 26 23:45:01 2014 +0000
tree 8bd18512a82b6648a4b4f36ae19a020fcdc95b13
parent 2e249c2e7a1bc2290d34c77d48206e97b8b883b6
parent acfc63760eef50cd451b80df8860d17bbab1ca33

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

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 0b60ef5..529e20f 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -100,9 +100,9 @@
 
   soinfo* found = NULL;
   ElfW(Sym)* sym = NULL;
-  if (handle == RTLD_DEFAULT || handle == (void*)0xffffffffL) {
+  if (handle == RTLD_DEFAULT) {
     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);
     soinfo* si = find_containing_library(caller_addr);