diff options
| author | Nikolai Saoukh <nms@otdel-1.org> | 2014-09-12 02:59:34 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-09-12 02:59:34 +0000 |
| commit | b6341b26989a482466877bd77b7008706dd6aaeb (patch) | |
| tree | 8fde4082317e8e4e062799960d20680dfbb8b786 /UefiCpuPkg/Library/CpuExceptionHandlerLib/X64 | |
| parent | c99106b745ccb2c7b66b50117b594eb1a942d4fb (diff) | |
| download | edk2-b6341b26989a482466877bd77b7008706dd6aaeb.tar.gz edk2-b6341b26989a482466877bd77b7008706dd6aaeb.tar.bz2 edk2-b6341b26989a482466877bd77b7008706dd6aaeb.zip | |
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 <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
Diffstat (limited to 'UefiCpuPkg/Library/CpuExceptionHandlerLib/X64')
| -rw-r--r-- | UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.S | 7 |
1 files changed, 1 insertions, 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
|