commit 1ad08626a143dc684e92f56754c7176cc4914ce8
author Zhenghua Wang <zhenghua.wang@intel.com> Tue Nov 29 22:42:30 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 29 22:42:30 2011 -0800
tree 63fd47cc8c33df12fa17610a53d000aa7c1c9d37
parent 0d9f87a3b71057cf804b2d7aa8589e3bf94eab28
parent 897815a1feff230be3ea42655a77dcbb9a8dcca9

am 897815a1: bionic: add machine type check

* commit '897815a1feff230be3ea42655a77dcbb9a8dcca9':
  bionic: add machine type check

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index e0a8a18..17008f8 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -707,7 +707,11 @@
     if (hdr->e_ident[EI_MAG3] != ELFMAG3) return -1;
 
     /* TODO: Should we verify anything else in the header? */
-
+#ifdef ANDROID_ARM_LINKER
+    if (hdr->e_machine != EM_ARM) return -1;
+#elif defined(ANDROID_X86_LINKER)
+    if (hdr->e_machine != EM_386) return -1;
+#endif
     return 0;
 }