diff options
| author | Michael Brown | 2006-05-28 16:21:29 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-05-28 16:21:29 +0200 |
| commit | 041a04335e60a939b5e1d2d6a2be0e24f2121e0c (patch) | |
| tree | 0d07a958262891b22135ba1db79a3fc9878ad22f | |
| parent | Added tcp_kick(). This speed up LILO and GRUB booting by almost two (diff) | |
| download | ipxe-041a04335e60a939b5e1d2d6a2be0e24f2121e0c.tar.gz ipxe-041a04335e60a939b5e1d2d6a2be0e24f2121e0c.tar.xz ipxe-041a04335e60a939b5e1d2d6a2be0e24f2121e0c.zip | |
Fixed assembly on old versions of gas
| -rw-r--r-- | src/arch/i386/prefix/libprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/transitions/librm.S | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/prefix/libprefix.S b/src/arch/i386/prefix/libprefix.S index 602d2dc11..10227818c 100644 --- a/src/arch/i386/prefix/libprefix.S +++ b/src/arch/i386/prefix/libprefix.S @@ -54,7 +54,7 @@ install_block: xorl %esi, %esi /* Calculate start and length of uninitialised data portion */ - leal (%edi,%ecx), %eax + addr32 leal (%edi,%ecx), %eax subl %ecx, %edx /* Do the copy */ diff --git a/src/arch/i386/transitions/librm.S b/src/arch/i386/transitions/librm.S index 7364f9f26..f1f1919d9 100644 --- a/src/arch/i386/transitions/librm.S +++ b/src/arch/i386/transitions/librm.S @@ -124,7 +124,7 @@ init_librm: shll $4, %eax movw $real_cs, %bx call set_seg_base - leal (%eax, %edi), %ebx + addr32 leal (%eax, %edi), %ebx movl %ebx, _text16 /* Store rm_ds and _data16, set up real_ds segment and set GDT base */ @@ -134,7 +134,7 @@ init_librm: shll $4, %eax movw $real_ds, %bx call set_seg_base - leal (%eax, %edi), %ebx + addr32 leal (%eax, %edi), %ebx movl %ebx, _data16 addl $gdt, %eax movl %eax, gdt_base @@ -409,7 +409,7 @@ prot_call: popw %fs popw %gs 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 * zeroes the high word of %esp, and interrupts * are still disabled at this point. */ |