From 4e2294b429b7e4cd259cdd976673353757ac2b29 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 8 Jan 2017 19:14:42 +1100 Subject: cpu/x86 asm: Just use the correct op suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LLVM AS doesn't support as much GNU junk extensions, data16/32 is almost never needed in truth if we just use the correct op suffix. So do that here, fixes clang/llvm builds with the integrated-as toggled on. Change-Id: I6095d03d0289b418a49a10f135de5eb0e117cae0 Also-by: Damien Zammit Signed-off-by: Damien Zammit Reviewed-on: https://review.coreboot.org/21218 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki Reviewed-by: Aaron Durbin --- src/cpu/x86/lapic/secondary.S | 2 +- src/cpu/x86/sipi_vector.S | 2 +- src/cpu/x86/smm/smm_stub.S | 4 ++-- src/cpu/x86/smm/smmhandler.S | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/x86/lapic/secondary.S b/src/cpu/x86/lapic/secondary.S index 671114ac9b..48360ad532 100644 --- a/src/cpu/x86/lapic/secondary.S +++ b/src/cpu/x86/lapic/secondary.S @@ -31,7 +31,7 @@ _secondary_start: movw %cs, %ax movw %ax, %ds - data32 lgdt gdtaddr - _secondary_start + lgdtl gdtaddr - _secondary_start movl %cr0, %eax andl $0x7FFAFFD1, %eax /* PG,AM,WP,NE,TS,EM,MP = 0 */ diff --git a/src/cpu/x86/sipi_vector.S b/src/cpu/x86/sipi_vector.S index e65491507e..1abf3f5d3b 100644 --- a/src/cpu/x86/sipi_vector.S +++ b/src/cpu/x86/sipi_vector.S @@ -79,7 +79,7 @@ _start: movl $(gdtaddr), %ebx sub $(_start), %ebx - data32 lgdt (%ebx) + lgdtl (%ebx) movl %cr0, %eax andl $~CR0_CLEAR_FLAGS, %eax diff --git a/src/cpu/x86/smm/smm_stub.S b/src/cpu/x86/smm/smm_stub.S index 824a26b858..32435a04b5 100644 --- a/src/cpu/x86/smm/smm_stub.S +++ b/src/cpu/x86/smm/smm_stub.S @@ -68,7 +68,7 @@ fallback_stack_top: .global _start _start: movl $(smm_relocate_gdt), %ebx - data32 lgdt (%ebx) + lgdtl (%ebx) movl %cr0, %eax andl $~CR0_CLEAR_FLAGS, %eax @@ -76,7 +76,7 @@ _start: movl %eax, %cr0 /* Enable protected mode */ - data32 ljmp $0x8, $smm_trampoline32 + ljmpl $0x8, $smm_trampoline32 .align 4 smm_relocate_gdt: diff --git a/src/cpu/x86/smm/smmhandler.S b/src/cpu/x86/smm/smmhandler.S index dd8a0c0cbd..b57d015789 100644 --- a/src/cpu/x86/smm/smmhandler.S +++ b/src/cpu/x86/smm/smmhandler.S @@ -110,7 +110,7 @@ smm_handler_start: untampered_lapic: #endif movw $(smm_gdtptr16 - smm_handler_start + SMM_HANDLER_OFFSET), %bx - data32 lgdt %cs:(%bx) + lgdtl %cs:(%bx) movl %cr0, %eax andl $0x7FFAFFD1, %eax /* PG,AM,WP,NE,TS,EM,MP = 0 */ @@ -118,7 +118,7 @@ untampered_lapic: movl %eax, %cr0 /* Enable protected mode */ - data32 ljmp $0x08, $1f + ljmpl $0x08, $1f .code32 1: -- cgit v1.2.3