diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/patches/grub-cross-system-i686.patch | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/patches/grub-cross-system-i686.patch')
| -rw-r--r-- | gnu/packages/patches/grub-cross-system-i686.patch | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/gnu/packages/patches/grub-cross-system-i686.patch b/gnu/packages/patches/grub-cross-system-i686.patch deleted file mode 100644 index 2715345d63..0000000000 --- a/gnu/packages/patches/grub-cross-system-i686.patch +++ /dev/null @@ -1,96 +0,0 @@ -Not upstreamed. -Fixes cross-build for the Hurd, from i686-linux, -see <https://bugs.gnu.org/41982>. - -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 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 | 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..ea39908c1 100644 ---- a/grub-core/lib/i386/relocator64.S -+++ b/grub-core/lib/i386/relocator64.S -@@ -63,7 +63,9 @@ VARIABLE(grub_relocator64_cr3) - movq %rax, %cr3 - #endif - -+#ifdef __x86_64__ - .code64 -+#endif - - /* mov imm64, %rax */ - .byte 0x48 -@@ -71,7 +73,14 @@ VARIABLE(grub_relocator64_cr3) - VARIABLE(grub_relocator64_rsp) - .quad 0 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsp */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc4 -+#else - movq %rax, %rsp -+#endif - - #ifdef GRUB_MACHINE_EFI - jmp 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 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsi */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc6 -+#else - movq %rax, %rsi -- -+#endif -+ - /* mov imm64, %rax */ - .byte 0x48 - .byte 0xb8 -@@ -128,6 +151,14 @@ VARIABLE(grub_relocator64_rdx) - #ifdef __APPLE__ - .byte 0xff, 0x25 - .quad 0 -+#elif !defined (__x86_64__) -+ /* jmp *LOCAL(jump_addr) (%rip) */ -+ .byte 0xff -+ .byte 0x25 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 - #else - jmp *LOCAL(jump_addr) (%rip) - #endif --- -Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org -Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com - |