X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-sh.h;h=9acbbbee9c3fe3e0a93c146e2c3e161817f0a78a;hb=4db089f5dd8a00eb4efdc8694735ef2cc3843998;hp=08c5fb3dbf68b98b503e0dfbf6e165a40c746465;hpb=98061ac36a26e216635cba6cf348f36360bd206e;p=fio.git

diff --git a/arch/arch-sh.h b/arch/arch-sh.h
index 08c5fb3d..9acbbbee 100644
--- a/arch/arch-sh.h
+++ b/arch/arch-sh.h
@@ -3,7 +3,7 @@
 #ifndef ARCH_SH_H
 #define ARCH_SH_H
 
-#define ARCH	(arch_sh)
+#define FIO_ARCH	(arch_sh)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set	288
@@ -22,13 +22,43 @@
 
 #define nop             __asm__ __volatile__ ("nop": : :"memory")
 
-#if defined(__SH4A__)
-#define	mb()		__asm__ __volatile__ ("synco": : :"memory")
-#else
-#define mb()		__asm__ __volatile__ (" " : : : "memory")
-#endif
+#define mb()								\
+	do {								\
+		if (arch_flags & ARCH_FLAG_1)				\
+			__asm__ __volatile__ ("synco": : :"memory");	\
+		else							\
+			__asm__ __volatile__ (" " : : : "memory");	\
+	} while (0)
 
 #define read_barrier()	mb()
 #define write_barrier()	mb()
 
+#include <stdio.h>
+#include <elf.h>
+
+extern unsigned long arch_flags;
+
+#define CPU_HAS_LLSC	0x0040
+
+static inline int arch_init(char *envp[])
+{
+	Elf32_auxv_t *auxv;
+
+	while (*envp++ != NULL)
+		;
+
+	for (auxv = (Elf32_auxv_t *) envp; auxv->a_type != AT_NULL; auxv++) {
+		if (auxv->a_type == AT_HWCAP) {
+			if (auxv->a_un.a_val & CPU_HAS_LLSC) {
+				arch_flags |= ARCH_FLAG_1;
+				break;
+			}
+		}
+	}
+
+	return 0;
+}
+
+#define ARCH_HAVE_INIT
+
 #endif