diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-16 06:50:35 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-16 06:50:35 +0000 |
| commit | 1bbb88c92e8af8771fb3805ee2a79eb75415c140 (patch) | |
| tree | bec88d4b7eab8cad53942412be1ce97a3c3fd6b0 /OvmfPkg | |
| parent | 429c05fa2bbfd4cb5b9c36f052c219bcb67e2c20 (diff) | |
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 <afish@apple.com>
[jordan.l.justen@intel.com: use .byte for retfq rather than lret]
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14055 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S | 4 |
1 files 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
|