diff options
| author | Alex Elder <elder@linaro.org> | 2014-06-30 16:09:32 -0500 |
|---|---|---|
| committer | Alex Elder <elder@linaro.org> | 2014-07-01 07:00:38 -0500 |
| commit | b74e4e23c81a2efa30dddfd285086d2ccdc22e7e (patch) | |
| tree | e5e72c17b3d4d8b4f6f26c434d9a1027f6152701 | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
mach-bcm SMC: address clang inline asm incompatibilityreview/clang-asm
My GCC-based build environment likes to call register r12 by the
name "ip" in inline asm. Behan Webster informed me that his Clang-
based build environment likes "r12" instead.
Try to make them both happy.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Behan Webster <behanw@converseincode.com>
| -rw-r--r-- | arch/arm/mach-bcm/bcm_kona_smc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index a55a7ecf146..3937bd5d452 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c @@ -106,9 +106,14 @@ int __init bcm_kona_smc_init(void) * request result appropriately. This result value is found in r0 * when the "smc" request completes. */ +#ifdef __clang__ +#define R12 "r12" +#else /* !__clang__ */ +#define R12 "ip" /* gcc calls r12 "ip" */ +#endif /* !__clang__ */ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys) { - register u32 ip asm("ip"); /* Also called r12 */ + register u32 ip asm(R12); /* Also called r12 */ register u32 r0 asm("r0"); register u32 r4 asm("r4"); register u32 r5 asm("r5"); @@ -120,7 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys) asm volatile ( /* Make sure we got the registers we want */ - __asmeq("%0", "ip") + __asmeq("%0", R12) __asmeq("%1", "r0") __asmeq("%2", "r4") __asmeq("%3", "r5") |