X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch.h;h=4fb9b518085aeeae06a390874ee35346ad5ef9b7;hb=e97412c38bedc4f365bdf4abe1ff8f6694587a86;hp=28c6632638c7c61dd32d1edff73c865fe85b4737;hpb=a1ea676e7a0ffc73fa5384ddb189ced9edd4b0bf;p=fio.git

diff --git a/arch/arch.h b/arch/arch.h
index 28c66326..4fb9b518 100644
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -1,9 +1,11 @@
 #ifndef ARCH_H
 #define ARCH_H
 
+#include "../lib/types.h"
+
 enum {
-	arch_x86_64,
-	arch_i386,
+	arch_x86_64 = 1,
+	arch_x86,
 	arch_ppc,
 	arch_ia64,
 	arch_s390,
@@ -11,13 +13,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"
@@ -31,14 +52,26 @@ 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"
+#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