* include/grub/symbol.h (FUNCTION), (VARIABLE) [__arm__]: Use % as

	prefix symbol, not @.

diff --git a/ChangeLog b/ChangeLog
index 31902b2b02523c39a4668178a81ecc8d977c4545..1ae823dd7c088ce67ed83c0496b13c2161a2fe9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/symbol.h (FUNCTION), (VARIABLE) [__arm__]: Use % as
+       prefix symbol, not @.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * INSTALL: Add note about older gcc and clang.

diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index 68aa2c51a0ea1fb33900a8fe371016e1c01c22f4..cfc00f202513ed8d47e1012b105fd885a872381c 100644 (file)
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -43,6 +43,9 @@
 #elif ! defined (__CYGWIN__) && ! defined (__MINGW32__)
 #define FUNCTION(x)    .globl EXT_C(x) ; .type EXT_C(x), @function ; EXT_C(x):
 #define VARIABLE(x)    .globl EXT_C(x) ; .type EXT_C(x), @object ; EXT_C(x):
+#elif defined (__arm__)
+#define FUNCTION(x)    .globl EXT_C(x) ; .type EXT_C(x), %function ; EXT_C(x):
+#define VARIABLE(x)    .globl EXT_C(x) ; .type EXT_C(x), %object ; EXT_C(x):
 #else
 /* .type not supported for non-ELF targets.  XXX: Check this in configure? */
 #define FUNCTION(x)    .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 32; .endef; EXT_C(x):