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

Support grub-emu on x32 (ILP32 but with x86-64 instruction set)

Browse source 
* configure.ac: Remove -m64 from checks for -mcmodel=large and
-mno-red-zone.  These are always either unnecessary (x86_64-emu) or
already in TARGET_CFLAGS at this point, and they produce incorrect
results when building for x32.
* grub-core/kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Cast
pointers to Elf64_Xword via grub_addr_t, in order to work on x32.
* include/grub/x86_64/types.h (GRUB_TARGET_SIZEOF_VOID_P,
GRUB_TARGET_SIZEOF_LONG): Define to 4 on x32.
This commit is contained in:
Colin Watson 2014-09-07 23:04:35 +01:00
parent 4d94b2db58
commit 2a5a532c00
4 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/grub/x86_64/types.h
View file

@ -20,10 +20,14 @@
#define GRUB_TYPES_CPU_HEADER 1
/* The size of void *. */
#ifdef __ILP32__
#define GRUB_TARGET_SIZEOF_VOID_P 4
#else
#define GRUB_TARGET_SIZEOF_VOID_P 8
#endif
/* The size of long. */
#ifdef __MINGW32__
#if defined(__MINGW32__) || defined(__ILP32__)
#define GRUB_TARGET_SIZEOF_LONG 4
#else
#define GRUB_TARGET_SIZEOF_LONG 8