diff --git a/ChangeLog b/ChangeLog index 31902b2b0..1ae823dd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-08 Vladimir Serbinenko + + * include/grub/symbol.h (FUNCTION), (VARIABLE) [__arm__]: Use % as + prefix symbol, not @. + 2013-11-08 Vladimir Serbinenko * INSTALL: Add note about older gcc and clang. diff --git a/include/grub/symbol.h b/include/grub/symbol.h index 68aa2c51a..cfc00f202 100644 --- 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):