From 164ebb480d007aac9499881ae45635dd291c5ca2 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 10 Feb 2012 12:47:42 +0100 Subject: [PATCH] * include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed. (FUNCTION) [GRUB_UTIL]: Likewise. (VARIABLE) [GRUB_UTIL]: Likewise. --- ChangeLog | 6 ++++++ include/grub/symbol.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 87fa1d0bf..1ece607fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-10 Vladimir Serbinenko + + * include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed. + (FUNCTION) [GRUB_UTIL]: Likewise. + (VARIABLE) [GRUB_UTIL]: Likewise. + 2012-02-10 Vladimir Serbinenko * include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and diff --git a/include/grub/symbol.h b/include/grub/symbol.h index c6adb7ee3..ddbb9b53f 100644 --- a/include/grub/symbol.h +++ b/include/grub/symbol.h @@ -25,6 +25,7 @@ #define LOCAL(sym) L_ ## sym /* Add an underscore to a C symbol in assembler code if needed. */ +#ifndef GRUB_UTIL #if HAVE_ASM_USCORE # define EXT_C(sym) _ ## sym #else @@ -42,6 +43,7 @@ #define FUNCTION(x) .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 32; .endef; EXT_C(x): #define VARIABLE(x) .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 0; .endef; EXT_C(x): #endif +#endif /* Mark an exported symbol. */ #ifndef GRUB_SYMBOL_GENERATOR