* grub-core/kern/arm/cache_armv6.S [__clang__]: Don't add .armv6 when

	compiling with clang.

diff --git a/ChangeLog b/ChangeLog
index 48b5d6f940136675317cc4be316fa0d2f7c06454..4d6003655e1502187882dea6cc7b8eb3645d97c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/arm/cache_armv6.S [__clang__]: Don't add .armv6 when
+       compiling with clang.
+
 2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * 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 e9da423ddd19b2a739c20a936738d48129ae7008..68d8298263e85647c2bbbad7b224d43cc4c9f29f 100644 (file)
--- 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