From 685475e59622cce56cc8a3d2b180241fc90e1d05 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Sep 2010 13:49:39 +0200
Subject: [PATCH] Fix yeeloong compilation

---
 grub-core/Makefile.am       |  1 +
 grub-core/Makefile.core.def |  3 +++
 include/grub/loader.h       | 12 ++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 8b8d993b3..504bd4463 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -137,6 +137,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/serial.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 endif
 
 if COND_powerpc_ieee1275
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index c0a796ee0..f4a555ebe 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -173,6 +173,8 @@ kernel = {
   videoinkernel = video/fb/video_fb.c;
   videoinkernel = video/video.c;
 
+  videoinkernel = commands/boot.c;
+
   extra_dist = kern/i386/realmode.S;
   extra_dist = kern/i386/pc/lzma_decode.S;
   extra_dist = kern/mips/cache_flush.S;
@@ -424,6 +426,7 @@ module = {
   name = boot;
   common = commands/boot.c;
   i386_pc = lib/i386/pc/biosnum.c;
+  enable = videomodules;
 };
 
 module = {
diff --git a/include/grub/loader.h b/include/grub/loader.h
index 319f3c551..c71e8dd10 100644
--- a/include/grub/loader.h
+++ b/include/grub/loader.h
@@ -26,16 +26,16 @@
 #include <grub/types.h>
 
 /* Check if a loader is loaded.  */
-int grub_loader_is_loaded (void);
+int EXPORT_FUNC (grub_loader_is_loaded) (void);
 
 /* Set loader functions. NORETURN must be set to true, if BOOT won't return
    to the original state.  */
-void grub_loader_set (grub_err_t (*boot) (void),
-		      grub_err_t (*unload) (void),
-		      int noreturn);
+void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void),
+					 grub_err_t (*unload) (void),
+					 int noreturn);
 
 /* Unset current loader, if any.  */
-void grub_loader_unset (void);
+void EXPORT_FUNC (grub_loader_unset) (void);
 
 /* Call the boot hook in current loader. This may or may not return,
    depending on the setting by grub_loader_set.  */
@@ -56,7 +56,7 @@ typedef enum {
 } grub_loader_preboot_hook_prio_t;
 
 /* Register a preboot hook. */
-void *grub_loader_register_preboot_hook (grub_err_t (*preboot_func) (int noret),
+void *EXPORT_FUNC(grub_loader_register_preboot_hook) (grub_err_t (*preboot_func) (int noret),
 					 grub_err_t (*preboot_rest_func) (void),
 					 grub_loader_preboot_hook_prio_t prio);