vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pull-in emu-lite fixes

Browse source
This commit is contained in:
BVK Chaitanya 2010-06-02 15:18:33 +05:30
commit bd7390ee84
8 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/kern/emu/cache.S
View file

@ -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"

12
grub-core/kern/emu/lite.c
View file

@ -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"

3
grub-core/kern/emu/main.c
View file

@ -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. */