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

Better support Apple Intel Macs on CD.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-13 00:38:04 +02:00
parent ba44ca6d1a
commit 67ab83538f
7 changed files with 268 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/grub/i386/macho.h
View file

@ -21,12 +21,12 @@
#include <grub/macho.h>
#define GRUB_MACHO_CPUTYPE_IS_HOST32(x) ((x)==0x00000007)
#define GRUB_MACHO_CPUTYPE_IS_HOST64(x) ((x)==0x01000007)
#define GRUB_MACHO_CPUTYPE_IS_HOST32(x) ((x) == GRUB_MACHO_CPUTYPE_IA32)
#define GRUB_MACHO_CPUTYPE_IS_HOST64(x) ((x) == GRUB_MACHO_CPUTYPE_AMD64)
#ifdef __x86_64__
#define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x)==0x01000007)
#define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x) == GRUB_MACHO_CPUTYPE_AMD64)
#else
#define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x)==0x00000007)
#define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x) == GRUB_MACHO_CPUTYPE_IA32)
#endif
struct grub_macho_thread32

7
include/grub/macho.h
View file

@ -26,6 +26,13 @@ struct grub_macho_fat_header
grub_uint32_t magic;
grub_uint32_t nfat_arch;
} __attribute__ ((packed));
enum
{
GRUB_MACHO_CPUTYPE_IA32 = 0x00000007,
GRUB_MACHO_CPUTYPE_AMD64 = 0x01000007
};
#define GRUB_MACHO_FAT_MAGIC 0xcafebabe
#define GRUB_MACHO_FAT_EFI_MAGIC 0x0ef1fab9