From 84c10c2e7928cf2128f2495b9d5ed916088b2f2b Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Mon, 23 Mar 2015 14:58:45 -0700 Subject: [PATCH] RTLD_LAZY is not supported, use RTLD_NOW instead. Change-Id: Ia08ed6416aef686435224b50b3e58955d09f04e2 --- libc/bionic/NetdClient.cpp | 2 +- libc/bionic/malloc_debug_common.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/bionic/NetdClient.cpp b/libc/bionic/NetdClient.cpp index 5b0f4fdde..b117d72a9 100644 --- a/libc/bionic/NetdClient.cpp +++ b/libc/bionic/NetdClient.cpp @@ -34,7 +34,7 @@ static void netdClientInitFunction(void* handle, const char* symbol, FunctionTyp } static void netdClientInitImpl() { - void* netdClientHandle = dlopen("libnetd_client.so", RTLD_LAZY); + void* netdClientHandle = dlopen("libnetd_client.so", RTLD_NOW); if (netdClientHandle == NULL) { // If the library is not available, it's not an error. We'll just use // default implementations of functions that it would've overridden. diff --git a/libc/bionic/malloc_debug_common.cpp b/libc/bionic/malloc_debug_common.cpp index 1a2765a60..ee796c6dc 100644 --- a/libc/bionic/malloc_debug_common.cpp +++ b/libc/bionic/malloc_debug_common.cpp @@ -402,7 +402,7 @@ static void malloc_init_impl() { } // Load .so that implements the required malloc debugging functionality. - void* malloc_impl_handle = dlopen(so_name, RTLD_LAZY); + void* malloc_impl_handle = dlopen(so_name, RTLD_NOW); if (malloc_impl_handle == NULL) { error_log("%s: Missing module %s required for malloc debug level %d: %s", getprogname(), so_name, g_malloc_debug_level, dlerror());