vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Apple fixes.

Browse source 
* grub-core/lib/i386/relocator16.S: Use correct __APPLE__ and not
	__APPLE_
	* grub-core/lib/i386/relocator_common.S [__APPLE__]: Fix gdtdesc
	definition.
	* grub-core/lib/i386/relocator64.S [__APPLE__]: Assemble jmp manually.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-26 14:56:28 +02:00
parent 9f3fc8835f
commit 489509f40e
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/lib/i386/relocator64.S
View file

@ -109,7 +109,12 @@ VARIABLE(grub_relocator64_rdx)
payload and makes this implementation easier. */
cld
#ifdef __APPLE__
.byte 0xff, 0x25
.quad 0
#else
jmp *LOCAL(jump_addr) (%rip)
#endif
LOCAL(jump_addr):
VARIABLE(grub_relocator64_rip)