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

* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix

Browse source 
i386 and x86-64 definedness tests.
This commit is contained in:
Colin Watson 2010-09-28 17:38:34 +01:00
parent f772623bc0
commit 0b4b227fae
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-09-28 Colin Watson <cjwatson@ubuntu.com>
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix
i386 and x86-64 definedness tests.
2010-09-27 Yves Blusseau <blusseau@zetam.org> 2010-09-27 Yves Blusseau <blusseau@zetam.org>
Fix generation of kernel_syms.lst Fix generation of kernel_syms.lst

4
grub-core/loader/multiboot_mbi2.c
View file

@ -705,7 +705,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
} }
} }
#if defined (GRUB_MACHINE_EFI) && __x86_64__ #if defined (GRUB_MACHINE_EFI) && defined (__x86_64__)
{ {
struct multiboot_tag_efi64 *tag = (struct multiboot_tag_efi64 *) ptrorig; struct multiboot_tag_efi64 *tag = (struct multiboot_tag_efi64 *) ptrorig;
tag->type = MULTIBOOT_TAG_TYPE_EFI64; tag->type = MULTIBOOT_TAG_TYPE_EFI64;
@ -715,7 +715,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
} }
#endif #endif
#if defined (GRUB_MACHINE_EFI) && __i386__ #if defined (GRUB_MACHINE_EFI) && defined (__i386__)
{ {
struct multiboot_tag_efi64 *tag = (struct multiboot_tag_efi32 *) ptrorig; struct multiboot_tag_efi64 *tag = (struct multiboot_tag_efi32 *) ptrorig;
tag->type = MULTIBOOT_TAG_TYPE_EFI32; tag->type = MULTIBOOT_TAG_TYPE_EFI32;