forked from Openwrt/openwrt
1cb489c784
Add two patches to fix compile errors being repeatedly seen on OpenWrt CI.
The first is an upstream backport to fix this i386-related error:
x86_64-openwrt-linux-musl-gcc -mcmodel=large -I./purgatory/include
-I./purgatory/arch/x86_64/include -I./util_lib/include -I./include -Iinclude
-I/builder/shared-workdir/build/sdk/staging_dir/toolchain-x86_64_gcc-13.3.0_musl/lib/gcc/x86_64-openwrt-linux-musl/13.3.0/include
-c -MD -o purgatory/arch/i386/entry32-16.o purgatory/arch/i386/entry32-16.S
purgatory/arch/i386/entry32-16.S: Assembler messages:
purgatory/arch/i386/entry32-16.S:23: Error: 64bit mode not supported on `i386'.
The second addresses an error using basename() on musl libc:
kexec/arch/i386/x86-linux-setup.c: In function 'add_edd_entry':
kexec/arch/i386/x86-linux-setup.c:332:20: warning: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
332 | if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
| ^~~~~~~~
kexec/arch/i386/x86-linux-setup.c:332:20: warning: passing argument 1 of 'sscanf' makes pointer from integer without a cast [-Wint-conversion]
332 | if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
| ^~~~~~~~~~~~~~~~~~~~
| |
| int
...
Fixes: #14621
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
82 lines
2.2 KiB
Diff
82 lines
2.2 KiB
Diff
From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001
|
|
From: Michel Lind <salimma@fedoraproject.org>
|
|
Date: Tue, 30 Jan 2024 04:14:31 -0600
|
|
Subject: [PATCH] Fix building on x86_64 with binutils 2.41
|
|
|
|
Newer versions of the GNU assembler (observed with binutils 2.41) will
|
|
complain about the ".arch i386" in files assembled with "as --64",
|
|
with the message "Error: 64bit mode not supported on 'i386'".
|
|
|
|
Fix by moving ".arch i386" below the relevant ".code32" directive, so
|
|
that the assembler is no longer expecting 64-bit instructions to be used
|
|
by the time that the ".arch i386" directive is encountered.
|
|
|
|
Based on similar iPXE fix:
|
|
https://github.com/ipxe/ipxe/commit/6ca597eee
|
|
|
|
Signed-off-by: Michel Lind <michel@michel-slm.name>
|
|
Signed-off-by: Simon Horman <horms@kernel.org>
|
|
---
|
|
purgatory/arch/i386/entry32-16-debug.S | 2 +-
|
|
purgatory/arch/i386/entry32-16.S | 2 +-
|
|
purgatory/arch/i386/entry32.S | 2 +-
|
|
purgatory/arch/i386/setup-x86.S | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- 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
|
|
- .arch i386
|
|
.balign 16
|
|
entry16_debug:
|
|
.code32
|
|
+ .arch i386
|
|
/* Compute where I am running at (assumes esp valid) */
|
|
call 1f
|
|
1: popl %ebx
|
|
--- 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
|
|
- .arch i386
|
|
.balign 16
|
|
entry16:
|
|
.code32
|
|
+ .arch i386
|
|
/* Compute where I am running at (assumes esp valid) */
|
|
call 1f
|
|
1: popl %ebx
|
|
--- a/purgatory/arch/i386/entry32.S
|
|
+++ b/purgatory/arch/i386/entry32.S
|
|
@@ -20,10 +20,10 @@
|
|
#undef i386
|
|
|
|
.text
|
|
- .arch i386
|
|
.globl entry32, entry32_regs
|
|
entry32:
|
|
.code32
|
|
+ .arch i386
|
|
|
|
/* Setup a gdt that should that is generally usefully */
|
|
lgdt %cs:gdt
|
|
--- a/purgatory/arch/i386/setup-x86.S
|
|
+++ b/purgatory/arch/i386/setup-x86.S
|
|
@@ -21,10 +21,10 @@
|
|
#undef i386
|
|
|
|
.text
|
|
- .arch i386
|
|
.globl purgatory_start
|
|
purgatory_start:
|
|
.code32
|
|
+ .arch i386
|
|
|
|
/* Load a gdt so I know what the segment registers are */
|
|
lgdt %cs:gdt
|