pull-in emu-lite fixes

grub-core/include/grub/cache.h

@@ -23,8 +23,7 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#if defined (__i386__) || defined (__x86_64__) || \
-  (defined (GRUB_MACHINE_EMU) && GRUB_MACHINE_EMU)
+#if defined (__i386__) || defined (__x86_64__)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))

grub-core/include/grub/dl.h

@@ -111,7 +111,7 @@ grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
+#if defined (_mips)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif

grub-core/include/grub/misc.h

@@ -50,9 +50,6 @@
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)	grub_memmove ((d), (s), (n))
 
-/* Flag to control module autoloading in normal mode.  */
-extern int EXPORT_VAR(grub_no_autoload);
-
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
 char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);
@@ -311,4 +308,11 @@ void EXPORT_FUNC (grub_halt) (int no_apm);
 void EXPORT_FUNC (grub_halt) (void);
 #endif
 
+#ifdef GRUB_MACHINE_EMU
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+#else
+#define grub_no_autoload 0
+#endif
+
 #endif /* ! GRUB_MISC_HEADER */

grub-core/kern/emu/cache.S

@@ -2,17 +2,13 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__) || defined(__x86_64__)
 /* Nothing is necessary.  */
-#elif defined(GRUB_CPU_X86_64)
-/* Nothing is necessary.  */
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/cache.S"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/cache.S"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/cache.S"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/cache.S"
 #else
 #error "No target cpu type is defined"

grub-core/kern/emu/lite.c

@@ -5,17 +5,15 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__)
 #include "../i386/dl.c"
-#elif defined(GRUB_CPU_X86_64)
+#elif defined(__x86_64__)
 #include "../x86_64/dl.c"
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/dl.c"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/dl.c"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/dl.c"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/dl.c"
 #else
 #error "No target cpu type is defined"

grub-core/kern/emu/main.c

@@ -52,6 +52,8 @@ static jmp_buf main_env;
 /* Store the prefix specified by an argument.  */
 static char *prefix = NULL;
 
+int grub_no_autoload;
+
 grub_addr_t
 grub_arch_modules_addr (void)
 {
@@ -203,7 +205,6 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-  /* Initialize all embedded modules.  */
   grub_init_all ();
 
   /* Make sure that there is a root device.  */

grub-core/kern/main.c

@@ -30,8 +30,6 @@
 #include <grub/reader.h>
 #include <grub/parser.h>
 
-int grub_no_autoload;
-
 void
 grub_module_iterate (int (*hook) (struct grub_module_header *header))
 {