commit 627ed9162538d847ea4e530fd443570d37f57d65
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 20 02:45:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 02:45:03 2017 +0000
tree 977fb95382aa5cd87e30cee3ade9919db1bb895d
parent 64cdd0c88618e8cd01870a0d300909e9d28aa170
parent 72007ee68f507c0ab952a0b98888fc19473ba6f0

Merge "Decode the common EM_ values."

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 72549cc..42c29c8 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -199,6 +199,15 @@
   return true;
 }
 
+static const char* EM_to_string(int em) {
+  if (em == EM_386) return "EM_386";
+  if (em == EM_AARCH64) return "EM_AARCH64";
+  if (em == EM_ARM) return "EM_ARM";
+  if (em == EM_MIPS) return "EM_MIPS";
+  if (em == EM_X86_64) return "EM_X86_64";
+  return "EM_???";
+}
+
 bool ElfReader::VerifyElfHeader() {
   if (memcmp(header_.e_ident, ELFMAG, SELFMAG) != 0) {
     DL_ERR("\"%s\" has bad ELF magic", name_.c_str());
@@ -244,7 +253,8 @@
   }
 
   if (header_.e_machine != GetTargetElfMachine()) {
-    DL_ERR("\"%s\" has unexpected e_machine: %d", name_.c_str(), header_.e_machine);
+    DL_ERR("\"%s\" has unexpected e_machine: %d (%s)", name_.c_str(), header_.e_machine,
+           EM_to_string(header_.e_machine));
     return false;
   }