commit 12bf3bcdeeaa0dcdc7a4f4e4d11bc2fc3bf6bd7a
author Dmitriy Ivanov <dimitry@google.com> Tue Jul 01 14:24:45 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Jul 01 14:46:03 2014 -0700
tree b43eb9e1c4715173e270dab940c91c48557555fe
parent 176ccd4925c682f036141c8618650b16912b9bd4

Write message to stderr on __libc_fatal()

Change-Id: Ia8d6e256768fa51786d0139d3f3b6e9e4bebe027

libc/bionic/libc_logging.cpp

diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index 8966a5f..8b3d3f1 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -619,7 +619,8 @@
   BufferOutputStream os(msg, sizeof(msg));
   out_vformat(os, format, args);
 
-  // TODO: log to stderr for the benefit of "adb shell" users.
+  // log to stderr for the benefit of "adb shell" users.
+  write(2, msg, strlen(msg));
 
   // Log to the log for the benefit of regular app developers (whose stdout and stderr are closed).
   __libc_write_log(ANDROID_LOG_FATAL, "libc", msg);

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 442f7ce..bf923c1 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -168,10 +168,7 @@
 #define DISALLOW_ALLOCATION(return_type, name, ...) \
     return_type name __VA_ARGS__ \
     { \
-        const char* msg = "ERROR: " #name " called from the dynamic linker!\n"; \
-        __libc_format_log(ANDROID_LOG_FATAL, "linker", "%s", msg); \
-        write(2, msg, strlen(msg)); \
-        abort(); \
+        __libc_fatal("ERROR: " #name " called from the dynamic linker!\n"); \
     }
 DISALLOW_ALLOCATION(void*, malloc, (size_t u __unused));
 DISALLOW_ALLOCATION(void, free, (void* u __unused));
@@ -467,10 +464,8 @@
                 static_cast<size_t>(s->st_size));
         return s;
       default:
-        const char* msg = "FATAL: Unexpected ST_BIND\n";
-        __libc_format_log(ANDROID_LOG_FATAL, "linker", "%s", msg);
-        write(2, msg, strlen(msg));
-        abort();
+        __libc_fatal("ERROR: Unexpected ST_BIND value: %d for '%s' in '%s'",
+            ELF_ST_BIND(s->st_info), name, si->name);
     }
   }