Change arch_i386 to arch_x86

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 16f4c3ab2f7b40a06e638c1fed1da7b96d921aa5..00d247c4ca44216a096f9a5f292b488093ab6378 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,15 +1,9 @@
 #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,
+       arch_x86_64 = 1,
+       arch_x86,
        arch_ppc,
        arch_ia64,
        arch_s390,
@@ -19,10 +13,25 @@ enum {
        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__)
@@ -47,16 +56,14 @@ enum {
 #include "arch-sh.h"
 #elif defined(__hppa__)
 #include "arch-hppa.h"
+#elif defined(__aarch64__)
+#include "arch-aarch64.h"
 #else
 #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"
-#endif
 
 #ifndef ARCH_HAVE_INIT
 static inline int arch_init(char *envp[])
@@ -65,11 +72,4 @@ static inline int arch_init(char *envp[])
 }
 #endif
 
-enum {
-       ARCH_FLAG_1     = 1 << 0,
-       ARCH_FLAG_2     = 1 << 1,
-       ARCH_FLAG_3     = 1 << 2,
-       ARCH_FLAG_4     = 1 << 3,
-};
-
 #endif