commit df3b922fcf056bb76665f9c06f0c19c48ef937f9
author Dimitry Ivanov <dimitry@google.com> Tue Mar 28 20:40:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 20:40:45 2017 +0000
tree 43fccf544ab500f853576fc46c232d207b703d39
parent 4b43140142c9569148f91d0dfc5b13994d55b698
parent 11968b80af5be601b820f261e2e102e5b8ed48c4

Merge "linker: log only real dlerrors"

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 5ccd656..96dd477 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -48,6 +48,7 @@
 
   char* old_value = *dlerror_slot;
   *dlerror_slot = new_value;
+  LD_LOG(kLogErrors, "%s\n", new_value);
   return old_value;
 }
 

linker/linker_globals.h

diff --git a/linker/linker_globals.h b/linker/linker_globals.h
index b6f8a04..e4e3d97 100644
--- a/linker/linker_globals.h
+++ b/linker/linker_globals.h
@@ -38,7 +38,6 @@
     do { \
       __libc_format_buffer(linker_get_error_buffer(), linker_get_error_buffer_size(), fmt, ##x); \
       /* If LD_DEBUG is set high enough, log every dlerror(3) message. */ \
-      LD_LOG(kLogErrors, "%s\n", linker_get_error_buffer()); \
     } while (false)
 
 #define DL_WARN(fmt, x...) \