From cf48d1e26027da65307e62ff9a9381acf92d5c87 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 22 Dec 2005 13:41:29 +0100
Subject: [PATCH] --- yaml --- r: 17778 b: refs/heads/master c:
 7043ad4f4c81914ca9e2cd2208c8f4801ed63735 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/asm-mips/hazards.h | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b79eebb2e87a..846ecc145352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15265251c5c68fbabdf561cf704e3e305349715a
+refs/heads/master: 7043ad4f4c81914ca9e2cd2208c8f4801ed63735
diff --git a/trunk/include/asm-mips/hazards.h b/trunk/include/asm-mips/hazards.h
index 7517189e469f..2fc90632f88c 100644
--- a/trunk/include/asm-mips/hazards.h
+++ b/trunk/include/asm-mips/hazards.h
@@ -233,15 +233,25 @@ __asm__(
 #endif
 
 #ifdef CONFIG_CPU_MIPSR2
+/*
+ * gcc has a tradition of misscompiling the previous construct using the
+ * address of a label as argument to inline assembler.  Gas otoh has the
+ * annoying difference between la and dla which are only usable for 32-bit
+ * rsp. 64-bit code, so can't be used without conditional compilation.
+ * The alterantive is switching the assembler to 64-bit code which happens
+ * to work right even for 32-bit code ...
+ */
 #define instruction_hazard()						\
 do {									\
-__label__ __next;							\
+	unsigned long tmp;						\
+									\
 	__asm__ __volatile__(						\
+	"	.set	mips64r2				\n"	\
+	"	dla	%0, 1f					\n"	\
 	"	jr.hb	%0					\n"	\
-	:								\
-	: "r" (&&__next));						\
-__next:									\
-	;								\
+	"	.set	mips0					\n"	\
+	"1:							\n"	\
+	: "=r" (tmp));							\
 } while (0)
 
 #else