Damien Zammit has uploaded this change for review. ( https://review.coreboot.org/21218
Change subject: cpu/x86 asm: Just use the correct op suffix ......................................................................
cpu/x86 asm: Just use the correct op suffix
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 damien@zamaudio.com Signed-off-by: Damien Zammit damien@zamaudio.com --- M src/cpu/x86/lapic/secondary.S M src/cpu/x86/sipi_vector.S M src/cpu/x86/smm/smm_stub.S M src/cpu/x86/smm/smmhandler.S M src/device/oprom/realmode/x86_asm.S 5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/21218/1
diff --git a/src/cpu/x86/lapic/secondary.S b/src/cpu/x86/lapic/secondary.S index 671114a..48360ad 100644 --- a/src/cpu/x86/lapic/secondary.S +++ b/src/cpu/x86/lapic/secondary.S @@ -31,7 +31,7 @@ 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 e654915..8e6925f 100644 --- a/src/cpu/x86/sipi_vector.S +++ b/src/cpu/x86/sipi_vector.S @@ -79,7 +79,7 @@ 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 824a26b..32435a0 100644 --- a/src/cpu/x86/smm/smm_stub.S +++ b/src/cpu/x86/smm/smm_stub.S @@ -68,7 +68,7 @@ .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 @@ 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 dd8a0c0..b57d015 100644 --- a/src/cpu/x86/smm/smmhandler.S +++ b/src/cpu/x86/smm/smmhandler.S @@ -110,7 +110,7 @@ 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 @@ movl %eax, %cr0
/* Enable protected mode */ - data32 ljmp $0x08, $1f + ljmpl $0x08, $1f
.code32 1: diff --git a/src/device/oprom/realmode/x86_asm.S b/src/device/oprom/realmode/x86_asm.S index 2bb2a3f..87348cd 100644 --- a/src/device/oprom/realmode/x86_asm.S +++ b/src/device/oprom/realmode/x86_asm.S @@ -177,7 +177,7 @@ /* Now that we are in protected mode * jump to a 32 bit code segment. */ - data32 ljmp $0x10, $RELOCATED(1f) + ljmpl $0x10, $RELOCATED(1f) 1: .code32 mov $0x18, %ax @@ -253,7 +253,7 @@ movl %eax, %cr0
/* Now really going into real mode */ - data32 ljmp $0, $RELOCATED(1f) + ljmpl $0, $RELOCATED(1f) 1:
/* put the stack at the end of page zero. That way we can easily @@ -297,7 +297,7 @@ movl %eax, %cr0
/* Now that we are in protected mode jump to a 32-bit code segment. */ - data32 ljmp $0x10, $RELOCATED(1f) + ljmpl $0x10, $RELOCATED(1f) 1: .code32 mov $0x18, %ax @@ -344,7 +344,7 @@ movl %eax, %cr0
/* ... and jump to a 32 bit code segment. */ - data32 ljmp $0x10, $RELOCATED(1f) + ljmpl $0x10, $RELOCATED(1f) 1: .code32 mov $0x18, %ax
-
Damien Zammit (Code Review)