* include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end

	occurencies with END.

diff --git a/ChangeLog b/ChangeLog
index 716f69c70ff4519a4fefe28b99c376e8e7c3b67e..f4f8757aa8427e8a60e087be17958655f935ba75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end
+       occurencies with END.
+
 2013-11-13  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-editenv.c (help_filter, argp): Document how to delete

diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
index a76076973c05ebc32da9305e80fe2bda360d30fd..9f8265315a9e3f0eb9e15abc457887b0e05b9321 100644 (file)
--- a/grub-core/kern/arm/efi/startup.S
+++ b/grub-core/kern/arm/efi/startup.S
@@ -33,4 +33,4 @@ FUNCTION(_start)
        str     r1, [ip]
        ldr     ip, =EXT_C(grub_main)
        bx      ip
-       .end
+       END

diff --git a/grub-core/kern/arm/misc.S b/grub-core/kern/arm/misc.S
index 68e4828fd3650740c9de731ded25a3d2cddd2b10..94522c222f3f1dc8ba2416c7b31a06b26a4755ee 100644 (file)
--- a/grub-core/kern/arm/misc.S
+++ b/grub-core/kern/arm/misc.S
@@ -58,4 +58,4 @@ FUNCTION(raise)
        mov     r0, #0
        bx      lr
        
-       .end
+       END

diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/uboot/startup.S
index 3473dacc9c190d225085ec0e6d1c666609a5135b..66c3ea4238ec49e7f81931b42bbf76c0a938e07b 100644 (file)
--- a/grub-core/kern/arm/uboot/startup.S
+++ b/grub-core/kern/arm/uboot/startup.S
@@ -166,4 +166,4 @@ transition_space:
 VARIABLE(grub_uboot_syscall_ptr)
        .long   0       @
 
-       .end
+       END

diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index 8f54dd8b97893fad36e12754e7fe798a3a692e9e..62d3cb1d1d9934990148dcf07448c364fd33e005 100644 (file)
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -37,6 +37,14 @@
 # define EXT_C(sym)    sym
 #endif
 
+#ifdef __arm__
+#ifdef __clang__
+#define END
+#else
+#define END .end
+#endif
+#endif
+
 #if defined (__APPLE__)
 #define FUNCTION(x)    .globl EXT_C(x) ; EXT_C(x):
 #define VARIABLE(x)    .globl EXT_C(x) ; EXT_C(x):