From 0b4b227faecce80c0d8a5406c82df59c45bce754 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 28 Sep 2010 17:38:34 +0100 Subject: [PATCH] * grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix i386 and x86-64 definedness tests. --- ChangeLog | 5 +++++ grub-core/loader/multiboot_mbi2.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e428dcd53..f33ddb6af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-09-28 Colin Watson + + * grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix + i386 and x86-64 definedness tests. + 2010-09-27 Yves Blusseau Fix generation of kernel_syms.lst diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index a20c82cad..75eaec33d 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -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; tag->type = MULTIBOOT_TAG_TYPE_EFI64; @@ -715,7 +715,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target) } #endif -#if defined (GRUB_MACHINE_EFI) && __i386__ +#if defined (GRUB_MACHINE_EFI) && defined (__i386__) { struct multiboot_tag_efi64 *tag = (struct multiboot_tag_efi32 *) ptrorig; tag->type = MULTIBOOT_TAG_TYPE_EFI32;