Skip to content

Commit

Permalink
OvmfPkg: Fix Xcode assembly issue
Browse files Browse the repository at this point in the history
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 <[email protected]>
[[email protected]: use .byte for retfq rather than lret]
Signed-off-by: Jordan Justen <[email protected]>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14055 6f19259b-4bc3-4df7-8a09-765794883524
  • Loading branch information
jljusten committed Jan 16, 2013
1 parent 429c05f commit 1bbb88c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1bbb88c

Please sign in to comment.