Unified grub-mkimage achieved

include/grub/efi/pe32.h

@@ -199,15 +199,8 @@ struct grub_pe64_optional_header
   struct grub_pe32_data_directory reserved_entry;
 };
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-
 #define GRUB_PE32_PE32_MAGIC	0x10b
-
-#else
-
-#define GRUB_PE32_PE32_MAGIC	0x20b
-
-#endif
+#define GRUB_PE32_PE64_MAGIC	0x20b
 
 #define GRUB_PE32_SUBSYSTEM_EFI_APPLICATION	10
 

include/grub/kernel.h

@@ -42,19 +42,33 @@ struct grub_module_header
 /* "gmim" (GRUB Module Info Magic).  */
 #define GRUB_MODULE_MAGIC 0x676d696d
 
-struct grub_module_info
+struct grub_module_info32
 {
   /* Magic number so we know we have modules present.  */
   grub_uint32_t magic;
-#if GRUB_TARGET_SIZEOF_VOID_P == 8
-  grub_uint32_t padding;
-#endif
   /* The offset of the modules.  */
-  grub_target_off_t offset;
+  grub_uint32_t offset;
   /* The size of all modules plus this header.  */
-  grub_target_size_t size;
+  grub_uint32_t size;
 };
 
+struct grub_module_info64
+{
+  /* Magic number so we know we have modules present.  */
+  grub_uint32_t magic;
+  grub_uint32_t padding;
+  /* The offset of the modules.  */
+  grub_uint64_t offset;
+  /* The size of all modules plus this header.  */
+  grub_uint64_t size;
+};
+
+#if GRUB_TARGET_SIZEOF_VOID_P == 8
+#define grub_module_info grub_module_info64
+#else
+#define grub_module_info grub_module_info32
+#endif
+
 extern grub_addr_t grub_arch_modules_addr (void);
 
 extern void EXPORT_FUNC(grub_module_iterate) (int (*hook) (struct grub_module_header *));

include/grub/offsets.h

@@ -46,6 +46,8 @@
 /* The segment where the kernel is loaded.  */
 #define GRUB_BOOT_I386_PC_KERNEL_SEG	0x800
 
+#define GRUB_KERNEL_I386_PC_LINK_ADDR  0x8200
+
 /* The upper memory area (starting at 640 kiB).  */
 #define GRUB_MEMORY_I386_PC_UPPER		0xa0000
 #define GRUB_MEMORY_I386_QEMU_UPPER		GRUB_MEMORY_I386_PC_UPPER