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