From: Vladimir Serbinenko Date: Sun, 8 Dec 2013 17:19:42 +0000 (+0100) Subject: * include/grub/kernel.h [__sparc__]: Restrict sparc64-ieee1275 to X-Git-Tag: grub-2.02-beta1~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=388f3cd0d1758338d6f27f7fb542d6148b922b35;p=thirdparty%2Fgrub.git * include/grub/kernel.h [__sparc__]: Restrict sparc64-ieee1275 to right platform rather than leaking to sparc64-emu. --- diff --git a/ChangeLog b/ChangeLog index 9e2ed0c60..f4691f3a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-08 Vladimir Serbinenko + + * include/grub/kernel.h [__sparc__]: Restrict sparc64-ieee1275 to + right platform rather than leaking to sparc64-emu. + 2013-12-08 Vladimir Serbinenko * grub-core/osdep/windows/emuconsole.c: Remove unsigned comparison >= 0. diff --git a/include/grub/kernel.h b/include/grub/kernel.h index a5067ef79..20ddf2da2 100644 --- a/include/grub/kernel.h +++ b/include/grub/kernel.h @@ -78,7 +78,7 @@ struct grub_module_info64 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) \ || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) \ || defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_ARC) \ - || defined (__sparc__) || defined (GRUB_MACHINE_UBOOT) || defined (GRUB_MACHINE_XEN) + || (defined (__sparc__) && defined (GRUB_MACHINE_IEEE1275)) || defined (GRUB_MACHINE_UBOOT) || defined (GRUB_MACHINE_XEN) /* FIXME: stack is between 2 heap regions. Move it. */ #define GRUB_KERNEL_PRELOAD_SPACE_REUSABLE 1 #endif