From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Feb 2016 08:10:08 +0000 (+0100)
Subject: Fix emu compilation error on arm.
X-Git-Tag: 2.02-beta3~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281baeecd3613eadb985f81cfe1b00ef937eb9e2;p=thirdparty%2Fgrub.git

Fix emu compilation error on arm.
---

diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 953a93c8a..f91280f68 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -201,7 +201,7 @@ main (int argc, char *argv[])
   volatile int hold = 0;
   size_t total_module_size = sizeof (struct grub_module_info), memdisk_size = 0;
   struct grub_module_info *modinfo;
-  char *mods;
+  void *mods;
 
   grub_util_host_init (&argc, &argv);
 
@@ -232,10 +232,10 @@ main (int argc, char *argv[])
       struct grub_module_header *header = (struct grub_module_header *) mods;
       header->type = OBJ_TYPE_MEMDISK;
       header->size = memdisk_size + sizeof (*header);
-      mods += sizeof (*header);
+      mods = header + 1;
 
       grub_util_load_image (arguments.mem_disk, mods);
-      mods += memdisk_size;
+      mods = (char *) mods + memdisk_size;
     }
 
   grub_modbase = (grub_addr_t) modinfo;