From 1bbb88c92e8af8771fb3805ee2a79eb75415c140 Mon Sep 17 00:00:00 2001 From: jljusten Date: Wed, 16 Jan 2013 06:50:35 +0000 Subject: [PATCH] OvmfPkg: Fix Xcode assembly issue The Xcode assembler is much pickier than GCC. Also the 64-bit linker is not a fan of relocations so it is better to us IP relative code, but at least it removes a relocation entry. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Andrew Fish [jordan.l.justen@intel.com: use .byte for retfq rather than lret] Signed-off-by: Jordan Justen git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14055 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S index 5b8c29a3ae..6a6335d063 100644 --- a/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S +++ b/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S @@ -32,9 +32,9 @@ ASM_PFX(JumpToKernel): // Jump into the compatibility mode CS pushq $0x10 - leaq 1f, %rax + leaq 1f(%rip), %rax pushq %rax - retfq + .byte 0x48, 0xcb ; retfq 1: // Now in compatibility mode .code32