mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-04 05:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

kexec-tools: Fix build with gas 2.42

Browse Source 
(From OE-Core rev: ed4c21d70e47c2c72d9fd30b7a744cc33fb660a5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2024-02-01 14:28:49 -08:00
committed by Richard Purdie
parent 47129c2fdd
commit a7ed494c4a
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-kernel/kexec/kexec-tools/0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch Normal file
View File

@@ -0,0 +1,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

1
meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
View File

@@ -17,6 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
file://0005-Disable-PIE-during-link.patch \
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
file://0001-kexec-tools-purgatory-fix-build-on-binutils-2.42.patch \
"
SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29"