From: robertmh <robertmh@localhost>
Date: Sun, 27 Jan 2008 23:16:58 +0000 (+0000)
Subject: * util/elf/grub-mkimage.c (add_segments): Likewise.
X-Git-Tag: 1.98~1659
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962ca13330702a39aa1729200e4ac3b75caccf88;p=thirdparty%2Fgrub.git

* util/elf/grub-mkimage.c (add_segments): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 4449d9bff..beb6aeddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* kern/powerpc/ieee1275/init.c (grub_arch_modules_addr): Skip
 	`GRUB_MOD_GAP' for platforms in which it's not defined.
+	* util/elf/grub-mkimage.c (add_segments): Likewise.
 
 2008-01-27  Robert Millan  <rmh@aybabtu.com>
 
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 316169f2d..8afde7985 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -217,6 +217,11 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
     {
       grub_addr_t modbase;
 
+/* Only needed for Apple hardware (therefore, powerpc).  */
+#ifndef GRUB_MOD_GAP
+#define GRUB_MOD_GAP 0
+#endif
+
       /* Place modules just after grub segment.  */
       modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);