diff --git a/core/unix/module_elf.c b/core/unix/module_elf.c
index 1710f68..26b56d0 100644
--- a/core/unix/module_elf.c
+++ b/core/unix/module_elf.c
@@ -193,7 +193,9 @@
         if (INTERNAL_OPTION(private_loader) &&
             ((elf_header.e_version != 1) ||
              (memory && elf_header.e_ehsize != sizeof(ELF_HEADER_TYPE)) ||
-             (memory && elf_header.e_machine != IF_X64_ELSE(EM_X86_64, EM_386))))
+             (memory && elf_header.e_machine != IF_ARM_ELSE(EM_ARM,
+                                                            IF_X64_ELSE(EM_X86_64,
+                                                                        EM_386)))))
             return false;
 #endif
         /* FIXME - should we add any of these to the check? For real
@@ -202,11 +204,10 @@
         ASSERT_CURIOSITY(!memory || elf_header.e_ehsize == sizeof(ELF_HEADER_TYPE));
         ASSERT_CURIOSITY(elf_header.e_ident[EI_OSABI] == ELFOSABI_SYSV ||
                          elf_header.e_ident[EI_OSABI] == ELFOSABI_LINUX);
-#ifdef X64
-        ASSERT_CURIOSITY(!memory || elf_header.e_machine == EM_X86_64);
-#else
-        ASSERT_CURIOSITY(!memory || elf_header.e_machine == EM_386);
-#endif
+        ASSERT_CURIOSITY(!memory ||
+                         elf_header.e_machine == IF_ARM_ELSE(EM_ARM,
+                                                             IF_X64_ELSE(EM_X86_64,
+                                                                         EM_386)));
         return true;
     }
     return false;