mirror of https://github.com/ipxe/ipxe.git
Fixed assembly on old versions of gas
parent
f743de4858
commit
041a04335e
|
@ -54,7 +54,7 @@ install_block:
|
||||||
xorl %esi, %esi
|
xorl %esi, %esi
|
||||||
|
|
||||||
/* Calculate start and length of uninitialised data portion */
|
/* Calculate start and length of uninitialised data portion */
|
||||||
leal (%edi,%ecx), %eax
|
addr32 leal (%edi,%ecx), %eax
|
||||||
subl %ecx, %edx
|
subl %ecx, %edx
|
||||||
|
|
||||||
/* Do the copy */
|
/* Do the copy */
|
||||||
|
|
|
@ -124,7 +124,7 @@ init_librm:
|
||||||
shll $4, %eax
|
shll $4, %eax
|
||||||
movw $real_cs, %bx
|
movw $real_cs, %bx
|
||||||
call set_seg_base
|
call set_seg_base
|
||||||
leal (%eax, %edi), %ebx
|
addr32 leal (%eax, %edi), %ebx
|
||||||
movl %ebx, _text16
|
movl %ebx, _text16
|
||||||
|
|
||||||
/* Store rm_ds and _data16, set up real_ds segment and set GDT base */
|
/* Store rm_ds and _data16, set up real_ds segment and set GDT base */
|
||||||
|
@ -134,7 +134,7 @@ init_librm:
|
||||||
shll $4, %eax
|
shll $4, %eax
|
||||||
movw $real_ds, %bx
|
movw $real_ds, %bx
|
||||||
call set_seg_base
|
call set_seg_base
|
||||||
leal (%eax, %edi), %ebx
|
addr32 leal (%eax, %edi), %ebx
|
||||||
movl %ebx, _data16
|
movl %ebx, _data16
|
||||||
addl $gdt, %eax
|
addl $gdt, %eax
|
||||||
movl %eax, gdt_base
|
movl %eax, gdt_base
|
||||||
|
@ -409,7 +409,7 @@ prot_call:
|
||||||
popw %fs
|
popw %fs
|
||||||
popw %gs
|
popw %gs
|
||||||
popal
|
popal
|
||||||
movl -20(%esp), %esp /* -20(%sp) is not a valid 80386 expression.
|
addr32 movl -20(%esp), %esp /* -20(%sp) is not a valid 80386 expression.
|
||||||
* -20(%esp) is safe because prot_to_real
|
* -20(%esp) is safe because prot_to_real
|
||||||
* zeroes the high word of %esp, and interrupts
|
* zeroes the high word of %esp, and interrupts
|
||||||
* are still disabled at this point. */
|
* are still disabled at this point. */
|
||||||
|
|
Loading…
Reference in New Issue