commit 84c10c2e7928cf2128f2495b9d5ed916088b2f2b
author Dmitriy Ivanov <dimitry@google.com> Mon Mar 23 14:58:45 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Mon Mar 23 14:58:45 2015 -0700
tree 398e5dd3c5fd5ab801975b3899f51c7c896ef808
parent 27b38599dc4b0b4941906d8da30022f516abf143

RTLD_LAZY is not supported, use RTLD_NOW instead.

Change-Id: Ia08ed6416aef686435224b50b3e58955d09f04e2

libc/bionic/NetdClient.cpp

diff --git a/libc/bionic/NetdClient.cpp b/libc/bionic/NetdClient.cpp
index 5b0f4fd..b117d72 100644
--- a/libc/bionic/NetdClient.cpp
+++ b/libc/bionic/NetdClient.cpp
@@ -34,7 +34,7 @@
 }
 
 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.

libc/bionic/malloc_debug_common.cpp

diff --git a/libc/bionic/malloc_debug_common.cpp b/libc/bionic/malloc_debug_common.cpp
index 1a2765a..ee796c6 100644
--- a/libc/bionic/malloc_debug_common.cpp
+++ b/libc/bionic/malloc_debug_common.cpp
@@ -402,7 +402,7 @@
   }
 
   // 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());