commit 61be84eb1105d3323094b0f8c96f441889fdbc2c
author Dimitry Ivanov <dimitry@google.com> Tue Aug 09 19:44:15 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Tue Aug 09 19:44:15 2016 -0700
tree 7f3062f8d2cffb1027bd1764cb017f8d988a3e7b
parent 4403b48f187ae7decca6a2dd9212bf1232507577
parent 241a272cf04f251ca558649bed5490f5e91949f5

resolve merge conflicts of 241a272 to nyc-mr1-dev-plus-aosp

Change-Id: I03618ad2f106cb9cdda007154a90c5dc64f9ff58

linker/linker_globals.h

diff --git a/linker/linker_globals.h b/linker/linker_globals.h
index 265af27..b6f8a04 100644
--- a/linker/linker_globals.h
+++ b/linker/linker_globals.h
@@ -49,6 +49,12 @@
       __libc_format_fd(2, "\n"); \
     } while (false)
 
+#define DL_ERR_AND_LOG(fmt, x...) \
+  do { \
+    DL_ERR(fmt, x); \
+    PRINT(fmt, x); \
+  } while (false)
+
 constexpr ElfW(Versym) kVersymNotNeeded = 0;
 constexpr ElfW(Versym) kVersymGlobal = 1;