From 513eeb61dd672df8a4c3cd0ca1c4a8d04d098872 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 13 Nov 2013 01:08:47 +0100 Subject: [PATCH] * grub-core/kern/arm/cache_armv6.S [__clang__]: Don't add .armv6 when compiling with clang. --- ChangeLog | 5 +++++ grub-core/kern/arm/cache_armv6.S | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 48b5d6f94..4d6003655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-13 Vladimir Serbinenko + + * grub-core/kern/arm/cache_armv6.S [__clang__]: Don't add .armv6 when + compiling with clang. + 2013-11-13 Vladimir Serbinenko * grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S index e9da423dd..68d829826 100644 --- a/grub-core/kern/arm/cache_armv6.S +++ b/grub-core/kern/arm/cache_armv6.S @@ -22,7 +22,9 @@ .text .syntax unified .arm +#ifndef __clang__ .arch armv6 +#endif # define DMB mcr p15, 0, r0, c7, c10, 5 # define DSB mcr p15, 0, r0, c7, c10, 4 # define ISB mcr p15, 0, r0, c7, c5, 4