ARM: 8300/1: teach __asmeq that r11 == fp and r12 == ip

The __asmeq macro is used inside inline asm statements to ensure that
register asm variables that explicitly specify a register are mapped
correctly onto those registers when used in inline asm input and output
constraints. However, the string based matching fails to take into
account that 'fp' is often referred to as 'r11' and 'ip' is often
referred to as 'r12', (e.g., by clang), causing false negatives.

Fix this by making __asmeq consider the ("fp","r11"), ("r11","fp"),
("ip","r12") and ("r12","ip") cases specifically.

Reviewed-by: Alex Elder <elder@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/compiler.h b/arch/arm/include/asm/compiler.h
index 8155db2f7fa16e706d1f0fed381d3be2e7ce214d..29fe85e5943907d7e7c8e20efdb4bf8c60721b6d 100644 (file)
--- a/arch/arm/include/asm/compiler.h
+++ b/arch/arm/include/asm/compiler.h
@@ -8,8 +8,21 @@
  * This string is meant to be concatenated with the inline asm string and
  * will cause compilation to stop on mismatch.
  * (for details, see gcc PR 15089)
+ * For compatibility with clang, we have to specifically take the equivalence
+ * of 'r11' <-> 'fp' and 'r12' <-> 'ip' into account as well.
  */
-#define __asmeq(x, y)  ".ifnc " x "," y " ; .err ; .endif\n\t"
+#define __asmeq(x, y)                          \
+       ".ifnc " x "," y "; "                   \
+         ".ifnc " x y ",fpr11; "               \
+           ".ifnc " x y ",r11fp; "             \
+             ".ifnc " x y ",ipr12; "           \
+               ".ifnc " x y ",r12ip; "         \
+                 ".err; "                      \
+               ".endif; "                      \
+             ".endif; "                        \
+           ".endif; "                          \
+         ".endif; "                            \
+       ".endif\n\t"
 
 
 #endif /* __ASM_ARM_COMPILER_H */