diff options
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch new file mode 100644 index 0000000000..6104a29d71 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 2cdbb12f4b101c7ecb3a4791819d9269d4f07c19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergei Trofimovich <slyich@gmail.com> | ||
3 | Date: Wed, 31 Jan 2024 10:05:08 +0000 | ||
4 | Subject: [PATCH] kexec-tools: purgatory: fix build on `binutils-2.42` | ||
5 | |||
6 | `binutils-2.42` introduced stricter checks on what `.arch` can be used | ||
7 | in 64-bit mode and started failing the build as: | ||
8 | |||
9 | $ as-2.42 --64 -o entry32-16-debug.o entry32-16-debug.s | ||
10 | purgatory/arch/i386/entry32-16-debug.S: Assembler messages: | ||
11 | purgatory/arch/i386/entry32-16-debug.S:28: Error: 64bit mode not supported on `i386'. | ||
12 | |||
13 | The change moves `.code32` before `.arch 386` as suggested in | ||
14 | https://sourceware.org/PR31319 | ||
15 | |||
16 | Upstream-Status: Submitted [https://lore.kernel.org/all/ZbopWV9qrxMME2hU@MiWiFi-R3L-srv/T/] | ||
17 | Signed-off-by: Sergei Trofimovich <slyich@gmail.com> | ||
18 | Reviewed-by: Baoquan He <bhe@redhat.com> | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | purgatory/arch/i386/entry32-16-debug.S | 2 +- | ||
22 | purgatory/arch/i386/entry32-16.S | 2 +- | ||
23 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S | ||
26 | index 5167944..297d6f5 100644 | ||
27 | --- a/purgatory/arch/i386/entry32-16-debug.S | ||
28 | +++ b/purgatory/arch/i386/entry32-16-debug.S | ||
29 | @@ -25,10 +25,10 @@ | ||
30 | .globl entry16_debug_pre32 | ||
31 | .globl entry16_debug_first32 | ||
32 | .globl entry16_debug_old_first32 | ||
33 | + .code32 | ||
34 | .arch i386 | ||
35 | .balign 16 | ||
36 | entry16_debug: | ||
37 | - .code32 | ||
38 | /* Compute where I am running at (assumes esp valid) */ | ||
39 | call 1f | ||
40 | 1: popl %ebx | ||
41 | diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S | ||
42 | index c051aab..7a84565 100644 | ||
43 | --- a/purgatory/arch/i386/entry32-16.S | ||
44 | +++ b/purgatory/arch/i386/entry32-16.S | ||
45 | @@ -20,10 +20,10 @@ | ||
46 | #undef i386 | ||
47 | .text | ||
48 | .globl entry16, entry16_regs | ||
49 | + .code32 | ||
50 | .arch i386 | ||
51 | .balign 16 | ||
52 | entry16: | ||
53 | - .code32 | ||
54 | /* Compute where I am running at (assumes esp valid) */ | ||
55 | call 1f | ||
56 | 1: popl %ebx | ||
57 | -- | ||
58 | 2.43.0 | ||
59 | |||