diff --git a/exec/crypto.c b/exec/crypto.c
index 2ba50524..9769c694 100644
--- a/exec/crypto.c
+++ b/exec/crypto.c
@@ -26,21 +26,18 @@
 typedef unsigned long ulong32;
 typedef unsigned long long ulong64;
 
-/*
- * Tested on arm2401, i386, x86_64 
- */
-#if defined(__arm__) 
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define ENDIAN_LITTLE
+#endif
+#if __BYTE_ORDER == __BIG_ENDIAN
 #define ENDIAN_BIG
-#define ENDIAN_32BITWORD
 #endif
-#if defined(__i386__) 
-#define ENDIAN_LITTLE
-#define ENDIAN_32BITWORD
-#endif
-#if defined(__x86_64__)
-#define ENDIAN_LITTLE
+#if __WORDIZE == 64
 #define ENDIAN_64BITWORD
 #endif
+#if __WORDIZE == 32
+#define ENDIAN_32BITWORD
+#endif
 
 /* ---- HELPER MACROS ---- */
 #ifdef ENDIAN_NEUTRAL