review fixes

diff --git a/commands/parttool.c b/commands/parttool.c
index f2a62e581d775417de10ac34a59ae23f65bc6d69..3dbe129bf484ebfa225553c64c0eaaf5c03ce341 100644 (file)
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -31,6 +31,10 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
+#if defined (GRUB_MACHINE_EMU)
+#include <grub/emu/misc.h>
+#endif
+
 static struct grub_parttool *parts = 0;
 static int curhandle = 0;
 static grub_dl_t mymod;
@@ -175,7 +179,9 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
+#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
+#endif
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");

diff --git a/configure.ac b/configure.ac
index 12f89d85e86b63c0ff1647b8bd5b621db24335d4..4cfa293086d9ed775f51cd1f33dd1df54d33cd12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,12 +54,14 @@ case "$target_cpu" in
   amd64)       target_cpu=x86_64 ;;
   sparc)       target_cpu=sparc64 ;;
   mipsel|mips64el)
-                target_cpu=mips;
-               cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
+                target_cpu=mips;    
+               TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
+               CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
                ;;
   mips|mips64)
-                target_cpu=mips;
-               cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
+                target_cpu=mips;    
+               TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
+               CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
                ;;
 esac
 
@@ -134,29 +136,25 @@ case "$host_os" in
 esac
 
 case "$platform" in
-  coreboot)    machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)   machine_CPPFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)         machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)    machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)                machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)          machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)         machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)    machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)   machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  coreboot)    machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)   machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)         machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)    machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)                machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)          machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)         machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)    machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)   machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
-  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
-  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
-  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
-  mips)        machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
-  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
-                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+  mips)        machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
-machine_CPPFLAGS="$machine_CPPFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
-CPPFLAGS="$CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_CFLAGS="$TARGET_CFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+CFLAGS="$CFLAGS $machine_CFLAGS"
+TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
 
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)

diff --git a/include/grub/cache.h b/include/grub/cache.h
index a54bc00f8c32790f1856171c98cfc82941df0cab..27e44f0a2d7b1fb6f4c66b4ecbac294d3be5843d 100644 (file)
--- a/include/grub/cache.h
+++ b/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)))

diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index bad00de71688332248a190b5d9a8bc9269a587bb..32a5e29f86bd38f1658514806ea845ea7aeaf35f 100644 (file)
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -49,4 +49,7 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
 extern char * canonicalize_file_name (const char *path);
 
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+
 #endif /* GRUB_EMU_MISC_H */

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 1ec8bbc5a7a2f68c8b112824aae2b579eaafacf9..9bfc6974e8127bfce4501ab1477e691569c2aa6f 100644 (file)
--- a/include/grub/misc.h
+++ b/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);

diff --git a/kern/emu/cache.S b/kern/emu/cache.S
index 9975578b81f053b495e64c01b74a327fa816d70d..90a5b5396e51cbe32531c88d857e921f75828279 100644 (file)
--- a/kern/emu/cache.S
+++ b/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)
-#include "../mips/cache.S"
-#elif defined(GRUB_CPU_MIPSEL)
+#elif defined(__mips__)
 #include "../mips/cache.S"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/cache.S"
 #else
 #error "No target cpu type is defined"

diff --git a/kern/emu/lite.c b/kern/emu/lite.c
index 884ddee108e9181a9f2bbdf8123c81fe1a685f88..9b3728717f8d748a37d4d695ba3a8c0ed1483c31 100644 (file)
--- a/kern/emu/lite.c
+++ b/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"

diff --git a/kern/emu/main.c b/kern/emu/main.c
index 8d6118c93b9ec83806afe26f879bb5661f4b368b..1915e1a7ce9c74abfab1cf42af598a7c923bc361 100644 (file)
--- a/kern/emu/main.c
+++ b/kern/emu/main.c
@@ -51,6 +51,9 @@ static jmp_buf main_env;
 /* Store the prefix specified by an argument.  */
 static char *prefix = NULL;
 
+/* Flag to control module autoloading in normal mode.  */
+int grub_no_autoload;
+
 grub_addr_t
 grub_arch_modules_addr (void)
 {

diff --git a/kern/main.c b/kern/main.c
index 2541d3295db753f6b3ae3c8abbf0a0ef7871be39..1fdf4ab07ace4408d62392e19309c940d43065fc 100644 (file)
--- a/kern/main.c
+++ b/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))
 {

diff --git a/normal/main.c b/normal/main.c
index b3544b99fa6b0360f6c689920645a8930ee4e2ce..d1e95d9b5f41ac95e8aba35185cf0ddfb95306a2 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -32,6 +32,10 @@
 #include <grub/i18n.h>
 #include <grub/charset.h>
 
+#if defined (GRUB_MACHINE_EMU)
+#include <grub/emu/misc.h>
+#endif
+
 #define GRUB_DEFAULT_HISTORY_SIZE      50
 
 static int nested_level = 0;
@@ -476,7 +480,9 @@ grub_normal_init_page (struct grub_term_output *term)
 static void
 read_lists (const char *val)
 {
+#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
+#endif
     {
       read_command_list (val);
       read_fs_list (val);