Change arch_i386 to arch_x86

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 87db222efa8c2c7f721739fcc581f7571314fb28..00d247c4ca44216a096f9a5f292b488093ab6378 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -2,8 +2,8 @@
 #define ARCH_H
 
 enum {
-       arch_x86_64,
-       arch_i386,
+       arch_x86_64 = 1,
+       arch_x86,
        arch_ppc,
        arch_ia64,
        arch_s390,
@@ -11,13 +11,32 @@ enum {
        arch_sparc,
        arch_sparc64,
        arch_arm,
+       arch_sh,
+       arch_hppa,
+       arch_mips,
+       arch_aarch64,
+
+       arch_generic,
+
+       arch_nr,
+};
+
+enum {
+       ARCH_FLAG_1     = 1 << 0,
+       ARCH_FLAG_2     = 1 << 1,
+       ARCH_FLAG_3     = 1 << 2,
+       ARCH_FLAG_4     = 1 << 3,
 };
 
+extern unsigned long arch_flags;
+
+#define ARCH_CPU_CLOCK_WRAPS
+
 #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"
@@ -33,14 +52,24 @@ enum {
 #include "arch-arm.h"
 #elif defined(__mips__) || defined(__mips64__)
 #include "arch-mips.h"
+#elif defined(__sh__)
+#include "arch-sh.h"
+#elif defined(__hppa__)
+#include "arch-hppa.h"
+#elif defined(__aarch64__)
+#include "arch-aarch64.h"
 #else
-#error "Unsupported arch"
+#warning "Unknown architecture, attempting to use generic model."
+#include "arch-generic.h"
 #endif
 
-#ifdef ARCH_HAVE_FFZ
-#define ffz(bitmask)   arch_ffz(bitmask)
-#else
 #include "../lib/ffz.h"
+
+#ifndef ARCH_HAVE_INIT
+static inline int arch_init(char *envp[])
+{
+       return 0;
+}
 #endif
 
 #endif