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

Make 'make check' work on emu.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-27 02:00:16 +02:00
parent db99fbe83f
commit a6393224c4
16 changed files with 82 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,8 @@
#include <grub/emu/misc.h>
#include <grub/disk.h>
const int grub_no_modules = 1;
void
grub_register_exported_symbols (void)
{
@ -44,12 +46,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
return GRUB_ERR_BAD_MODULE;
}
void
grub_emu_init (void)
{
grub_no_autoload = 1;
}
#if defined (__ia64__) || defined (__powerpc__)
void grub_arch_dl_get_tramp_got_size (const void *ehdr __attribute__ ((unused)),
grub_size_t *tramp, grub_size_t *got)
@ -66,7 +62,3 @@ grub_arch_dl_init_linker (void)
}
#endif
void
grub_emu_post_init (void)
{
}

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

@ -21,6 +21,8 @@
#error "No target cpu type is defined"
#endif
const int grub_no_modules = 0;
/* grub-emu-lite supports dynamic module loading, so it won't have any
embedded modules. */
void
@ -34,14 +36,3 @@ grub_fini_all (void)
{
return;
}
void
grub_emu_init (void)
{
return;
}
void
grub_emu_post_init (void)
{
}

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

@ -55,8 +55,6 @@ static jmp_buf main_env;
/* Store the prefix specified by an argument. */
static char *root_dev = NULL, *dir = NULL;
int grub_no_autoload;
grub_addr_t grub_modbase = 0;
void
@ -171,7 +169,6 @@ void grub_hostfs_init (void);
void grub_hostfs_fini (void);
void grub_host_init (void);
void grub_host_fini (void);
void grub_emu_init (void);
int
main (int argc, char *argv[])
@ -208,7 +205,6 @@ main (int argc, char *argv[])
}
signal (SIGINT, SIG_IGN);
grub_emu_init ();
grub_console_init ();
grub_host_init ();
@ -219,8 +215,6 @@ main (int argc, char *argv[])
grub_hostfs_init ();
grub_emu_post_init ();
/* Make sure that there is a root device. */
if (! root_dev)
root_dev = grub_strdup ("host");