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

* grub-core/loader/machoXX.c: Fix compilation on non-i386.

This commit is contained in:
Vladimir Serbinenko 2013-12-17 22:44:46 +01:00
parent 1123bed944
commit 3e88fbfa6e
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-17 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/machoXX.c: Fix compilation on non-i386.
2013-12-17 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/xen_fileXX.c: Silence cast-align.

2
grub-core/loader/macho32.c
View File

@ -1,4 +1,4 @@
#include <grub/cpu/macho.h>
#include <grub/macho.h>
#include <grub/machoload.h>
#define SUFFIX(x) x ## 32

2
grub-core/loader/macho64.c
View File

@ -1,4 +1,4 @@
#include <grub/cpu/macho.h>
#include <grub/macho.h>
#include <grub/machoload.h>
#define SUFFIX(x) x ## 64

19
include/grub/i386/macho.h
View File

@ -29,23 +29,4 @@
#define GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT(x) ((x) == GRUB_MACHO_CPUTYPE_IA32)
#endif
struct grub_macho_thread32
{
grub_uint32_t cmd;
grub_uint32_t cmdsize;
grub_uint8_t unknown1[48];
grub_uint32_t entry_point;
grub_uint8_t unknown2[20];
} GRUB_PACKED;
struct grub_macho_thread64
{
grub_uint32_t cmd;
grub_uint32_t cmdsize;
grub_uint8_t unknown1[0x88];
grub_uint64_t entry_point;
grub_uint8_t unknown2[0x20];
} GRUB_PACKED;
#endif

18
include/grub/macho.h
View File

@ -139,6 +139,24 @@ union grub_macho_filestart
struct grub_macho_lzss_header lzss;
} GRUB_PACKED;
struct grub_macho_thread32
{
grub_uint32_t cmd;
grub_uint32_t cmdsize;
grub_uint8_t unknown1[48];
grub_uint32_t entry_point;
grub_uint8_t unknown2[20];
} GRUB_PACKED;
struct grub_macho_thread64
{
grub_uint32_t cmd;
grub_uint32_t cmdsize;
grub_uint8_t unknown1[0x88];
grub_uint64_t entry_point;
grub_uint8_t unknown2[0x20];
} GRUB_PACKED;
#define GRUB_MACHO_LZSS_OFFSET 0x180
grub_size_t