Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-27 01:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation for x86_64-efi.

Browse Source
This commit is contained in:
Vladimir Serbinenko committed 2017-09-07 13:55:22 +02:00
1 parent 1b18d6b0d3
commit 78d2b81bd1
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/loader/multiboot.c
+1 -1
View File
@@ -143,7 +143,7 @@ efi_boot (struct grub_relocator *rel,
#else #else
struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE; struct grub_relocator_efi_state state_efi = MULTIBOOT_EFI_INITIAL_STATE;
#endif #endif
state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = grub_multiboot_payload_eip; state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = GRUB_MULTIBOOT (payload_eip);
state_efi.MULTIBOOT_EFI_MBI_REGISTER = target; state_efi.MULTIBOOT_EFI_MBI_REGISTER = target;
grub_relocator_efi_boot (rel, state_efi); grub_relocator_efi_boot (rel, state_efi);
include/grub/i386/multiboot.h
+4
View File
@@ -43,6 +43,10 @@
.rcx = 0, \ .rcx = 0, \
.rdx = 0, \ .rdx = 0, \
} }
#define MULTIBOOT2_EFI_INITIAL_STATE { .rax = MULTIBOOT2_BOOTLOADER_MAGIC, \
.rcx = 0, \
.rdx = 0, \
}
#define MULTIBOOT_EFI_ENTRY_REGISTER rip #define MULTIBOOT_EFI_ENTRY_REGISTER rip
#define MULTIBOOT_EFI_MBI_REGISTER rbx #define MULTIBOOT_EFI_MBI_REGISTER rbx
#endif #endif