Merge "Removed dlsym handle != NULL check for lp64"
diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 7e3b3f4..7bcb59f 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -89,10 +89,13 @@
void* dlsym(void* handle, const char* symbol) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
+#if !defined(__LP64__)
if (handle == NULL) {
__bionic_format_dlerror("dlsym library handle is null", NULL);
return NULL;
}
+#endif
+
if (symbol == NULL) {
__bionic_format_dlerror("dlsym symbol name is null", NULL);
return NULL;
@@ -100,9 +103,9 @@
soinfo* found = NULL;
ElfW(Sym)* sym = NULL;
- if (handle == RTLD_DEFAULT) {
+ if (handle == RTLD_DEFAULT || handle == (void*)0xffffffffL) {
sym = dlsym_linear_lookup(symbol, &found, NULL);
- } else if (handle == RTLD_NEXT || handle == (void*)0xffffffffL) {
+ } else if (handle == RTLD_NEXT || handle == (void*)0xfffffffeL) {
void* caller_addr = __builtin_return_address(0);
soinfo* si = find_containing_library(caller_addr);
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 434e38f..3459a56 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -101,6 +101,8 @@
void* sym;
+ // lp64 RTLD_DEFAULT=(void*)0
+#if !defined(__LP64__)
// NULL handle.
sym = dlsym(NULL, "test");
ASSERT_TRUE(sym == NULL);
@@ -109,6 +111,7 @@
#else
ASSERT_SUBSTR("undefined symbol: test", dlerror()); // glibc isn't specific about the failure.
#endif
+#endif // !defined(__LP64__)
// NULL symbol name.
#if defined(__BIONIC__)