From d97e7b5935896a7c5bfe0592385bf19a77f97560 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Apr 2011 01:37:48 +0200
Subject: [PATCH] 	* include/grub/dl.h [ASM_FILE]: Adapt for assembly. 
 * grub-core/lib/i386/setjmp.S: Add missing GRUB_MOD_LICENSE. 	*
 grub-core/lib/x86_64/setjmp.S: Likewise. 	* grub-core/lib/mips/setjmp.S:
 Likewise. 	* grub-core/lib/powerpc/setjmp.S: Likewise. 	*
 grub-core/lib/sparc64/setjmp.S: Likewise.

---
 ChangeLog                      |  9 +++++++++
 grub-core/lib/i386/setjmp.S    |  3 +++
 grub-core/lib/mips/setjmp.S    |  3 +++
 grub-core/lib/powerpc/setjmp.S |  3 +++
 grub-core/lib/sparc64/setjmp.S |  3 +++
 grub-core/lib/x86_64/setjmp.S  |  3 +++
 include/grub/dl.h              | 31 ++++++++++++++++++++++++++++---
 7 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 877186e23..c78ae8cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/dl.h [ASM_FILE]: Adapt for assembly.
+	* grub-core/lib/i386/setjmp.S: Add missing GRUB_MOD_LICENSE.
+	* grub-core/lib/x86_64/setjmp.S: Likewise.
+	* grub-core/lib/mips/setjmp.S: Likewise.
+	* grub-core/lib/powerpc/setjmp.S: Likewise.
+	* grub-core/lib/sparc64/setjmp.S: Likewise.
+
 2011-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/efi/datetime.c: Add missing GRUB_MOD_LICENSE.
diff --git a/grub-core/lib/i386/setjmp.S b/grub-core/lib/i386/setjmp.S
index a2002ae3d..5b7aa158b 100644
--- a/grub-core/lib/i386/setjmp.S
+++ b/grub-core/lib/i386/setjmp.S
@@ -17,9 +17,12 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/dl.h>
 
 	.file	"setjmp.S"
 
+GRUB_MOD_LICENSE ("GPLv3+")
+
 	.text
 
 /*
diff --git a/grub-core/lib/mips/setjmp.S b/grub-core/lib/mips/setjmp.S
index 8ab6222c4..8259c9d22 100644
--- a/grub-core/lib/mips/setjmp.S
+++ b/grub-core/lib/mips/setjmp.S
@@ -17,9 +17,12 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/dl.h>
 
 	.file	"setjmp.S"
 
+GRUB_MOD_LICENSE ("GPLv3+")
+
 	.text
 
 /*
diff --git a/grub-core/lib/powerpc/setjmp.S b/grub-core/lib/powerpc/setjmp.S
index 25cbaa3e9..8c7540e3c 100644
--- a/grub-core/lib/powerpc/setjmp.S
+++ b/grub-core/lib/powerpc/setjmp.S
@@ -17,9 +17,12 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/dl.h>
 
 	.file	"setjmp.S"
 
+GRUB_MOD_LICENSE ("GPLv3+")
+
 	.text
 
 /*
diff --git a/grub-core/lib/sparc64/setjmp.S b/grub-core/lib/sparc64/setjmp.S
index 0e23ecfa1..5c2ec2cf3 100644
--- a/grub-core/lib/sparc64/setjmp.S
+++ b/grub-core/lib/sparc64/setjmp.S
@@ -17,9 +17,12 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/dl.h>
 
         .file   "setjmp.S"
 
+GRUB_MOD_LICENSE ("GPLv3+")
+
         .text
 
 /*
diff --git a/grub-core/lib/x86_64/setjmp.S b/grub-core/lib/x86_64/setjmp.S
index 621b09b93..b1f1b22cb 100644
--- a/grub-core/lib/x86_64/setjmp.S
+++ b/grub-core/lib/x86_64/setjmp.S
@@ -17,9 +17,12 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/dl.h>
 
 	.file	"setjmp.S"
 
+GRUB_MOD_LICENSE ("GPLv3+")
+
 	.text
 
 /*
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 71db90c8b..6f23f7d63 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -21,15 +21,18 @@
 #define GRUB_DL_H	1
 
 #include <grub/symbol.h>
+#ifndef ASM_FILE
 #include <grub/err.h>
 #include <grub/types.h>
 #include <grub/elf.h>
+#endif
 
 /*
  * Macros GRUB_MOD_INIT and GRUB_MOD_FINI are also used by build rules
  * to collect module names, so we define them only when they are not
  * defined already.
  */
+#ifndef ASM_FILE
 
 #ifndef GRUB_MOD_INIT
 #define GRUB_MOD_INIT(name)	\
@@ -66,10 +69,20 @@ __asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
 
 #endif
 
+#endif
+
+#ifndef ASM_FILE
 #ifdef APPLE_CC
-#define GRUB_MOD_SECTION(x) "_" x ", _" x ""
+#define GRUB_MOD_SECTION(x) "_" #x ", _" #x ""
 #else
-#define GRUB_MOD_SECTION(x) "." x
+#define GRUB_MOD_SECTION(x) "." #x
+#endif
+#else
+#ifdef APPLE_CC
+#define GRUB_MOD_SECTION(x) _ ## x , _ ##x 
+#else
+#define GRUB_MOD_SECTION(x) . ## x
+#endif
 #endif
 
 /* Me, Vladimir Serbinenko, hereby I add this module check as per new
@@ -80,8 +93,16 @@ __asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
    constitutes linking) and GRUB core being licensed under GPLv3+.
    Be sure to understand your license obligations.
 */
+#ifndef ASM_FILE
 #define GRUB_MOD_LICENSE(license)	\
-  static char grub_module_license[] __attribute__ ((section (GRUB_MOD_SECTION ("module_license")), used)) = "LICENSE=" license;
+  static char grub_module_license[] __attribute__ ((section (GRUB_MOD_SECTION (module_license)), used)) = "LICENSE=" license;
+#else
+#define GRUB_MOD_LICENSE(license)	\
+  .section GRUB_MOD_SECTION(module_license), "a";	\
+  .ascii "LICENSE="; \
+  .ascii license; \
+  .byte 0
+#endif
 
 /* Under GPL license obligations you have to distribute your module
    under GPLv3(+). However, you can also distribute the same code under
@@ -89,6 +110,8 @@ __asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
 */
 #define GRUB_MOD_DUAL_LICENSE(x)
 
+#ifndef ASM_FILE
+
 struct grub_dl_segment
 {
   struct grub_dl_segment *next;
@@ -143,4 +166,6 @@ grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 void grub_arch_dl_init_linker (void);
 #endif
 
+#endif
+
 #endif /* ! GRUB_DL_H */