* grub-core/bus/cs5536.c: Don't include grub/machine/kernel.h on

non-loongson.
	* grub-core/kern/mips/dl.c (grub_arch_dl_init_linker): Fix argument
	to grub_dl_register_symbol.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-15 15:41:23 +02:00
parent 67b1e5c907
commit c3fc520c0d
3 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,10 @@
2011-05-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/bus/cs5536.c: Don't include grub/machine/kernel.h on
non-loongson.
* grub-core/kern/mips/dl.c (grub_arch_dl_init_linker): Fix argument
to grub_dl_register_symbol.
2011-05-15 Vladimir Serbinenko <phcoder@gmail.com> 2011-05-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix compilation errors. Fix compilation errors.

View file

@ -21,7 +21,9 @@
#include <grub/pci.h> #include <grub/pci.h>
#include <grub/time.h> #include <grub/time.h>
#include <grub/ata.h> #include <grub/ata.h>
#ifdef GRUB_MACHINE_MIPS_LOONGSON
#include <grub/machine/kernel.h> #include <grub/machine/kernel.h>
#endif
#include <grub/dl.h> #include <grub/dl.h>

View file

@ -234,6 +234,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
void void
grub_arch_dl_init_linker (void) grub_arch_dl_init_linker (void)
{ {
grub_dl_register_symbol ("__gnu_local_gp", &__gnu_local_gp_dummy, 0); grub_dl_register_symbol ("__gnu_local_gp", &__gnu_local_gp_dummy, 0, 0);
} }