From 4f1cfd22d3bf5c88f2f956ce9cbf2479b47f6a0d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 7 Nov 2013 01:18:21 +0100 Subject: [PATCH] * include/grub/symbol.h (FUNCTION): Use @function rather than "function". (VARIABLE): Likewise. --- ChangeLog | 6 ++++++ include/grub/symbol.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5be787e99..fd60875f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-07 Vladimir Serbinenko + + * include/grub/symbol.h (FUNCTION): Use @function rather than + "function". + (VARIABLE): Likewise. + 2013-11-07 Vladimir Serbinenko * grub-core/net/bootp.c (OFFSET_OF): Explicitly cast to grub_size_t. diff --git a/include/grub/symbol.h b/include/grub/symbol.h index 390eb62f2..68aa2c51a 100644 --- a/include/grub/symbol.h +++ b/include/grub/symbol.h @@ -41,8 +41,8 @@ #define FUNCTION(x) .globl EXT_C(x) ; EXT_C(x): #define VARIABLE(x) .globl EXT_C(x) ; EXT_C(x): #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): +#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):