]> git.proxmox.com Git - mirror_edk2.git/commitdiff
UefiCpuPkg: error: invalid instruction mnemonic 'retf'
authorNikolai Saoukh <nms@otdel-1.org>
Fri, 12 Sep 2014 02:59:34 +0000 (02:59 +0000)
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 12 Sep 2014 02:59:34 +0000 (02:59 +0000)
.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 <nms@otdel-1.org>
Reviewed-by: Andrew Fish <afish@apple.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16098 6f19259b-4bc3-4df7-8a09-765794883524

UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S

index f371fd350adef7a640c484d7f519d1fc06daa43e..49ef7b19680d052ad359b056da10db7e37e920e9 100644 (file)
@@ -378,12 +378,7 @@ DoReturn:
     pushq   0x18(%rax)        # save EFLAGS in new location\r
     movq    (%rax), %rax      # restore rax\r
     popfq                     # restore EFLAGS\r
-    .byte   0x48              # prefix to composite "retq" with next "retf"\r
-#ifdef __APPLE__\r
-    .byte   0xCB\r
-#else\r
-    retf                      # far return\r
-#endif\r
+    lretq                     # far return\r
 DoIret:\r
     iretq\r
 \r