projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that init depends on FIO-VERSION-FILE
[fio.git]
/
arch
/
arch.h
diff --git
a/arch/arch.h
b/arch/arch.h
index b4f26307c6eeee3bd34901091d1d668b59a5e587..4ad49a42b74f0c5b08e4f245f49571ea0b96fc5e 100644
(file)
--- a/
arch/arch.h
+++ b/
arch/arch.h
@@
-8,7
+8,7
@@
#endif
enum {
#endif
enum {
- arch_x86_64,
+ arch_x86_64
= 1
,
arch_i386,
arch_ppc,
arch_ia64,
arch_i386,
arch_ppc,
arch_ia64,
@@
-18,8
+18,18
@@
enum {
arch_sparc64,
arch_arm,
arch_sh,
arch_sparc64,
arch_arm,
arch_sh,
+ arch_hppa,
arch_generic,
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,
};
#if defined(__i386__)
};
#if defined(__i386__)
@@
-44,6
+54,8
@@
enum {
#include "arch-mips.h"
#elif defined(__sh__)
#include "arch-sh.h"
#include "arch-mips.h"
#elif defined(__sh__)
#include "arch-sh.h"
+#elif defined(__hppa__)
+#include "arch-hppa.h"
#else
#warning "Unknown architecture, attempting to use generic model."
#include "arch-generic.h"
#else
#warning "Unknown architecture, attempting to use generic model."
#include "arch-generic.h"
@@
-55,4
+67,11
@@
enum {
#include "../lib/ffz.h"
#endif
#include "../lib/ffz.h"
#endif
+#ifndef ARCH_HAVE_INIT
+static inline int arch_init(char *envp[])
+{
+ return 0;
+}
+#endif
+
#endif
#endif