From: Michel Lind <[email protected]> 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 <[email protected]> --- 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(-) diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S index 5167944..12e1164 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 - .arch i386 .balign 16 entry16_debug: .code32 + .arch i386 /* 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..eace095 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 - .arch i386 .balign 16 entry16: .code32 + .arch i386 /* Compute where I am running at (assumes esp valid) */ call 1f 1: popl %ebx diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S index f7a494f..8ce9e31 100644 --- 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 diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S index 201bb2c..a212eed 100644 --- 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 --- base-commit: 94fbe64fb22d61726ca0c0996987574b6c783c19 change-id: 20240130-fix-binutils-2-41-7642ab3b6ee7 Best regards, -- Michel Lind <[email protected]> _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
