Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 28c6632638c7c61dd32d1edff73c865fe85b4737..b4f26307c6eeee3bd34901091d1d668b59a5e587 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,6 +1,12 @@
 #ifndef ARCH_H
 #define ARCH_H
 
+#ifdef __WORDSIZE
+#define BITS_PER_LONG  __WORDSIZE
+#else
+#define BITS_PER_LONG  32
+#endif
+
 enum {
        arch_x86_64,
        arch_i386,
@@ -11,13 +17,16 @@ enum {
        arch_sparc,
        arch_sparc64,
        arch_arm,
+       arch_sh,
+
+       arch_generic,
 };
 
 #if defined(__i386__)
 #include "arch-x86.h"
 #elif defined(__x86_64__)
 #include "arch-x86_64.h"
-#elif defined(__powerpc__) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__)
 #include "arch-ppc.h"
 #elif defined(__ia64__)
 #include "arch-ia64.h"
@@ -31,8 +40,13 @@ enum {
 #include "arch-sparc64.h"
 #elif defined(__arm__)
 #include "arch-arm.h"
+#elif defined(__mips__) || defined(__mips64__)
+#include "arch-mips.h"
+#elif defined(__sh__)
+#include "arch-sh.h"
 #else
-#error "Unsupported arch"
+#warning "Unknown architecture, attempting to use generic model."
+#include "arch-generic.h"
 #endif
 
 #ifdef ARCH_HAVE_FFZ