Browse Source

Fixed assembly on old versions of gas

tags/v0.9.3
Michael Brown 18 years ago
parent
commit
041a04335e
2 changed files with 4 additions and 4 deletions
  1. 1
    1
      src/arch/i386/prefix/libprefix.S
  2. 3
    3
      src/arch/i386/transitions/librm.S

+ 1
- 1
src/arch/i386/prefix/libprefix.S View File

54
 	xorl	%esi, %esi
54
 	xorl	%esi, %esi
55
 
55
 
56
 	/* Calculate start and length of uninitialised data portion */
56
 	/* Calculate start and length of uninitialised data portion */
57
-	leal	(%edi,%ecx), %eax
57
+	addr32 leal	(%edi,%ecx), %eax
58
 	subl	%ecx, %edx
58
 	subl	%ecx, %edx
59
 	
59
 	
60
 	/* Do the copy */
60
 	/* Do the copy */

+ 3
- 3
src/arch/i386/transitions/librm.S View File

124
 	shll	$4, %eax
124
 	shll	$4, %eax
125
 	movw	$real_cs, %bx
125
 	movw	$real_cs, %bx
126
 	call	set_seg_base
126
 	call	set_seg_base
127
-	leal	(%eax, %edi), %ebx
127
+	addr32 leal	(%eax, %edi), %ebx
128
 	movl	%ebx, _text16
128
 	movl	%ebx, _text16
129
 
129
 
130
 	/* Store rm_ds and _data16, set up real_ds segment and set GDT base */
130
 	/* Store rm_ds and _data16, set up real_ds segment and set GDT base */
134
 	shll	$4, %eax
134
 	shll	$4, %eax
135
 	movw	$real_ds, %bx
135
 	movw	$real_ds, %bx
136
 	call	set_seg_base
136
 	call	set_seg_base
137
-	leal	(%eax, %edi), %ebx
137
+	addr32 leal	(%eax, %edi), %ebx
138
 	movl	%ebx, _data16
138
 	movl	%ebx, _data16
139
 	addl	$gdt, %eax
139
 	addl	$gdt, %eax
140
 	movl	%eax, gdt_base
140
 	movl	%eax, gdt_base
409
 	popw	%fs
409
 	popw	%fs
410
 	popw	%gs
410
 	popw	%gs
411
 	popal
411
 	popal
412
-	movl	-20(%esp), %esp /* -20(%sp) is not a valid 80386 expression.
412
+	addr32 movl	-20(%esp), %esp /* -20(%sp) is not a valid 80386 expression.
413
 				 * -20(%esp) is safe because prot_to_real
413
 				 * -20(%esp) is safe because prot_to_real
414
 				 * zeroes the high word of %esp, and interrupts
414
 				 * zeroes the high word of %esp, and interrupts
415
 				 * are still disabled at this point. */
415
 				 * are still disabled at this point. */

Loading…
Cancel
Save