* include/grub/symbol.h (FUNCTION), (VARIABLE): Fix precedence logic.

diff --git a/ChangeLog b/ChangeLog
index 1ae823dd7c088ce67ed83c0496b13c2161a2fe9e..a7e519291e4d35986f54b437dbce61a6468a12df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/symbol.h (FUNCTION), (VARIABLE): Fix precedence logic.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/symbol.h (FUNCTION), (VARIABLE) [__arm__]: Use % as

diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index cfc00f202513ed8d47e1012b105fd885a872381c..8f54dd8b97893fad36e12754e7fe798a3a692e9e 100644 (file)
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -40,16 +40,16 @@
 #if defined (__APPLE__)
 #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):
+#elif defined (__CYGWIN__) || defined (__MINGW32__)
+/* .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):
+#define VARIABLE(x)    .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 0; .endef; 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):
-#define VARIABLE(x)    .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 0; .endef; 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):
 #endif
 #endif