From b6341b26989a482466877bd77b7008706dd6aaeb Mon Sep 17 00:00:00 2001 From: Nikolai Saoukh Date: Fri, 12 Sep 2014 02:59:34 +0000 Subject: [PATCH] UefiCpuPkg: error: invalid instruction mnemonic 'retf' .S assembler files must be AT&T syntax ones. So Intel syntax mnemonic is not good. Discovered by clang integrated assembler. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Nikolai Saoukh Reviewed-by: Andrew Fish Reviewed-by: Jeff Fan git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16098 6f19259b-4bc3-4df7-8a09-765794883524 --- .../CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S index f371fd350a..49ef7b1968 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S @@ -378,12 +378,7 @@ DoReturn: pushq 0x18(%rax) # save EFLAGS in new location movq (%rax), %rax # restore rax popfq # restore EFLAGS - .byte 0x48 # prefix to composite "retq" with next "retf" -#ifdef __APPLE__ - .byte 0xCB -#else - retf # far return -#endif + lretq # far return DoIret: iretq -- 2.39.2