* include/grub/dl.h: Switch from APPLE_CC to __APPLE__.

	(GRUB_MOD_LICENSE) [ASM_FILE]: Make into macro. All users updated.

diff --git a/ChangeLog b/ChangeLog
index 479b4fc09ea5468c3670c6553512f7f98cf7d3fa..d42bcfd3f4e365036c7e54427142c844342b6eb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/dl.h: Switch from APPLE_CC to __APPLE__.
+       (GRUB_MOD_LICENSE) [ASM_FILE]: Make into macro. All users updated.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/symbol.h (EXT_C) [!ASM_FILE]: Redefine with strings.

diff --git a/grub-core/lib/i386/setjmp.S b/grub-core/lib/i386/setjmp.S
index 5b7aa158bcf0f53e1c2202851c8dd42a9e6c16a7..0b0740f1102429d5a0d3bfb813c77c5a6b99df97 100644 (file)
--- a/grub-core/lib/i386/setjmp.S
+++ b/grub-core/lib/i386/setjmp.S
@@ -21,7 +21,7 @@
 
        .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv3+")
+GRUB_MOD_LICENSE "GPLv3+"
 
        .text
 

diff --git a/grub-core/lib/ia64/setjmp.S b/grub-core/lib/ia64/setjmp.S
index 190623d35512dfc2005b70e00e76bd34d21e3b6c..dc19be0ce3f9ac534b7b18c62f7ef64f471bae77 100644 (file)
--- a/grub-core/lib/ia64/setjmp.S
+++ b/grub-core/lib/ia64/setjmp.S
@@ -69,7 +69,7 @@
 
        .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv2+")
+GRUB_MOD_LICENSE "GPLv2+"
 
        /* The following two entry points are the traditional entry points: */
 

diff --git a/grub-core/lib/mips/setjmp.S b/grub-core/lib/mips/setjmp.S
index 8259c9d22328b770e6bc66555ec09aaa05b1caa0..f0129451850c89dd13b5715bed95a3165ea9e915 100644 (file)
--- a/grub-core/lib/mips/setjmp.S
+++ b/grub-core/lib/mips/setjmp.S
@@ -21,7 +21,7 @@
 
        .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv3+")
+GRUB_MOD_LICENSE "GPLv3+"
 
        .text
 

diff --git a/grub-core/lib/powerpc/setjmp.S b/grub-core/lib/powerpc/setjmp.S
index 8c7540e3c9c1f4f0665c9c5db604fe3ef2918080..c301a7b07656fde73f63b0fd0e26dcf09ac2320c 100644 (file)
--- a/grub-core/lib/powerpc/setjmp.S
+++ b/grub-core/lib/powerpc/setjmp.S
@@ -21,7 +21,7 @@
 
        .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv3+")
+GRUB_MOD_LICENSE "GPLv3+"
 
        .text
 

diff --git a/grub-core/lib/sparc64/setjmp.S b/grub-core/lib/sparc64/setjmp.S
index 5c2ec2cf3a4fcb4ff1828d115ad10683e5215005..ec9c53057e61108abba75bd1bc18ce9fbd1e7246 100644 (file)
--- a/grub-core/lib/sparc64/setjmp.S
+++ b/grub-core/lib/sparc64/setjmp.S
@@ -21,7 +21,7 @@
 
         .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv3+")
+GRUB_MOD_LICENSE "GPLv3+"
 
         .text
 

diff --git a/grub-core/lib/x86_64/setjmp.S b/grub-core/lib/x86_64/setjmp.S
index b1f1b22cb26340835db6a0c97faf81a439e8e204..6b151bc4d936110755f72b68117786f0b6e36454 100644 (file)
--- a/grub-core/lib/x86_64/setjmp.S
+++ b/grub-core/lib/x86_64/setjmp.S
@@ -21,7 +21,7 @@
 
        .file   "setjmp.S"
 
-GRUB_MOD_LICENSE ("GPLv3+")
+GRUB_MOD_LICENSE "GPLv3+"
 
        .text
 

diff --git a/include/grub/dl.h b/include/grub/dl.h
index 19450d5da93c1930a6b29dc4047e09c18b749469..3119978f10743953bac77deb4ee8c1b31cfb748d 100644 (file)
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -77,13 +77,13 @@ grub_mod_fini (void)
 #endif
 
 #ifndef ASM_FILE
-#ifdef APPLE_CC
+#ifdef __APPLE__
 #define GRUB_MOD_SECTION(x) "_" #x ", _" #x ""
 #else
 #define GRUB_MOD_SECTION(x) "." #x
 #endif
 #else
-#ifdef APPLE_CC
+#ifdef __APPLE__
 #define GRUB_MOD_SECTION(x) _ ## x , _ ##x 
 #else
 #define GRUB_MOD_SECTION(x) . ## x
@@ -114,11 +114,21 @@ static const char grub_module_name_##name[] \
 static const char grub_module_depend_##name[] \
  __attribute__((section(GRUB_MOD_SECTION(moddeps)), __used__)) = #name
 #else
-#define GRUB_MOD_LICENSE(license)      \
-  .section GRUB_MOD_SECTION(module_license), "a";      \
-  .ascii "LICENSE="; \
-  .ascii license; \
+#ifdef __APPLE__
+.macro GRUB_MOD_LICENSE
+  .section GRUB_MOD_SECTION(module_license)
+  .ascii "LICENSE="
+  .ascii $0
+  .byte 0
+.endm
+#else
+.macro GRUB_MOD_LICENSE license
+  .section GRUB_MOD_SECTION(module_license), "a"
+  .ascii "LICENSE="
+  .ascii "\license"
   .byte 0
+.endm
+#endif
 #endif
 
 /* Under GPL license obligations you have to distribute your module