diff options
| author | Michel Lind <salimma@fedoraproject.org> | 2024-01-30 04:14:31 -0600 |
|---|---|---|
| committer | Simon Horman <horms@kernel.org> | 2024-02-02 09:39:06 +0100 |
| commit | 328de8e00e298f00d7ba6b25dc3950147e9642e6 (patch) | |
| tree | a7f6e49daee75a853a6f196f9225b51196c0eabb | |
| parent | 94fbe64fb22d61726ca0c0996987574b6c783c19 (diff) | |
| download | kexec-tools-328de8e00e298f00d7ba6b25dc3950147e9642e6.tar.gz | |
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>
| -rw-r--r-- | purgatory/arch/i386/entry32-16-debug.S | 2 | ||||
| -rw-r--r-- | purgatory/arch/i386/entry32-16.S | 2 | ||||
| -rw-r--r-- | purgatory/arch/i386/entry32.S | 2 | ||||
| -rw-r--r-- | 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 5167944d..12e11649 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 c051aab0..eace0958 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 f7a494f1..8ce9e316 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 201bb2cb..a212eed4 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 |