diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-07-08 11:18:18 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-07-08 11:23:41 +0200 |
| commit | 54e70a70f2cb6336b02ed3ac4256f6b44da5c769 (patch) | |
| tree | 05b360de5868560cfb2fdcfd2d8345272bd53ab3 | |
| parent | 413c31dc7aabcffc6b180fc0a003f149c9743c08 (diff) | |
| download | guix-54e70a70f2cb6336b02ed3ac4256f6b44da5c769.tar guix-54e70a70f2cb6336b02ed3ac4256f6b44da5c769.tar.gz | |
gnu: grub: Fix native compilation of EFI variant on i686-linux.
This fixes a regression introduce in d613991a8ebe5d4b3a7706f8f0dd52f16fc1c50a
reported on IRC by Mathieu Othacehe <othacehe@gnu.org>.
* gnu/packages/patches/grub-cross-system-i686.patch
[GRUB_MACHINE_EFI && !__x86_64__]: Add missing .byte alternative to 64-bit
instruction.
| -rw-r--r-- | gnu/packages/patches/grub-cross-system-i686.patch | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/gnu/packages/patches/grub-cross-system-i686.patch b/gnu/packages/patches/grub-cross-system-i686.patch index a376cae1db..2715345d63 100644 --- a/gnu/packages/patches/grub-cross-system-i686.patch +++ b/gnu/packages/patches/grub-cross-system-i686.patch @@ -2,18 +2,20 @@ Not upstreamed. Fixes cross-build for the Hurd, from i686-linux, see <https://bugs.gnu.org/41982>. -From 270667540146f8ef9ea7a44258a71b3837a7af4a Mon Sep 17 00:00:00 2001 +From 17b242e7b80108f1467037e15b605595e4823b2e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org> Date: Sun, 21 Jun 2020 15:10:40 +0200 -Subject: [PATCH] grub-core: Build fixes for i386 +Subject: [PATCH v2] grub-core: Build fixes for i386 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 * grub-core/lib/i386/relocator64.S: Avoid x86_64 instructions on i386. --- - grub-core/lib/i386/relocator64.S | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) + grub-core/lib/i386/relocator64.S | 33 +++++++++++++++++++++++++++++++- + 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/grub-core/lib/i386/relocator64.S b/grub-core/lib/i386/relocator64.S -index 148f38adb..45fed9444 100644 +index 148f38adb..ea39908c1 100644 --- a/grub-core/lib/i386/relocator64.S +++ b/grub-core/lib/i386/relocator64.S @@ -63,7 +63,9 @@ VARIABLE(grub_relocator64_cr3) @@ -41,7 +43,22 @@ index 148f38adb..45fed9444 100644 #ifdef GRUB_MACHINE_EFI jmp LOCAL(skip_efi_stack_align) -@@ -95,8 +104,15 @@ LOCAL(skip_efi_stack_align): +@@ -85,7 +94,14 @@ VARIABLE(grub_relocator64_rsp) + */ + VARIABLE(grub_relocator64_efi_start) + /* Align the stack as UEFI spec requires. */ ++#ifndef __x86_64__ ++ .byte 0x48 ++ .byte 0x83 ++ .byte 0xe4 ++ .byte 0xf0 ++#else + andq $~15, %rsp ++#endif + + LOCAL(skip_efi_stack_align): + #endif +@@ -95,8 +111,15 @@ LOCAL(skip_efi_stack_align): VARIABLE(grub_relocator64_rsi) .quad 0 @@ -58,7 +75,7 @@ index 148f38adb..45fed9444 100644 /* mov imm64, %rax */ .byte 0x48 .byte 0xb8 -@@ -128,6 +144,14 @@ VARIABLE(grub_relocator64_rdx) +@@ -128,6 +151,14 @@ VARIABLE(grub_relocator64_rdx) #ifdef __APPLE__ .byte 0xff, 0x25 .quad 0 |