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/device/oprom/realmode/x86_asm.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/device') diff --git a/src/device/oprom/realmode/x86_asm.S b/src/device/oprom/realmode/x86_asm.S index 2bb2a3f053..87348cdc22 100644 --- a/src/device/oprom/realmode/x86_asm.S +++ b/src/device/oprom/realmode/x86_asm.S @@ -177,7 +177,7 @@ __lcall_instr = RELOCATED(.) /* 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 @@ __realmode_interrupt: 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 @@ __intXX_instr = RELOCATED(.) 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 @@ __interrupt_handler_16bit = RELOCATED(.) 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 -- cgit v1.2.3