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

2
grub-core/lib/i386/relocator16.S
View file

@ -84,7 +84,7 @@ VARIABLE(grub_relocator16_start)
movl %esi, %eax
shrl $4, %eax
#ifdef __APPLE_
#ifdef __APPLE__
LOCAL(segment_offset) = LOCAL (segment) - LOCAL (base)
LOCAL(idt_offset) = LOCAL(relocator16_idt) - LOCAL (base)
LOCAL(cont2_offset) = LOCAL (cont2) - LOCAL(base)