* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.

	As these functions are used on pre-ARMv6 CPUs as well we don't want
	to make assembler assume that architecture is higher than default one.

diff --git a/ChangeLog b/ChangeLog
index 21ec1c77c5774dd8648cf7c5e37ca8d11d7596f7..153bc43c1c5e796783a47a5bc036b1edf8a2e456 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
+
+       As these functions are used on pre-ARMv6 CPUs as well we don't want
+       to make assembler assume that architecture is higher than default one.
+
 2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>
 
        * grub-core/osdep/windows/platform.c (get_platform): Fix EFI

diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S
index 39da1dfc60665803acf3cdde814d89e06dee0b55..dfaded0eb302dde7254b6557ddcc6345e41f3a41 100644 (file)
--- a/grub-core/kern/arm/cache_armv6.S
+++ b/grub-core/kern/arm/cache_armv6.S
@@ -22,7 +22,6 @@
        .text
        .syntax unified
        .arm
-       .arch   armv6
 
 # define DMB   mcr     p15, 0, r0, c7, c10, 5
 # define DSB   mcr     p15, 0, r0, c7, c10, 4