summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/i386/entry16.inc16
-rw-r--r--src/cpu/i386/entry32.inc8
-rw-r--r--src/cpu/i386/reset32.inc6
3 files changed, 15 insertions, 15 deletions
diff --git a/src/cpu/i386/entry16.inc b/src/cpu/i386/entry16.inc
index c357504735..7ab3ff3bf0 100644
--- a/src/cpu/i386/entry16.inc
+++ b/src/cpu/i386/entry16.inc
@@ -28,10 +28,10 @@ it with the version available from LANL.
/* .section ".rom.text" */
#include <arch/rom_segs.h>
.code16
-.globl EXT(_start)
-.type EXT(_start), @function
+.globl _start
+.type _start, @function
-EXT(_start):
+_start:
cli
/* thanks to kmliu@sis.tw.com for this TBL fix ... */
@@ -84,7 +84,7 @@ EXT(_start):
movw %cs, %ax
shlw $4, %ax
- movw $EXT(gdtptr16_offset), %bx
+ movw $gdtptr16_offset, %bx
subw %ax, %bx
data32 lgdt %cs:(%bx)
@@ -101,12 +101,12 @@ EXT(_start):
*/
.align 4
-.globl EXT(gdtptr16)
-EXT(gdtptr16):
+.globl gdtptr16
+gdtptr16:
.word gdt_end - gdt -1 /* compute the table limit */
.long gdt /* we know the offset */
-.globl EXT(_estart)
-EXT(_estart):
+.globl _estart
+_estart:
.code32
diff --git a/src/cpu/i386/entry32.inc b/src/cpu/i386/entry32.inc
index 8ccd638e95..6f55f00203 100644
--- a/src/cpu/i386/entry32.inc
+++ b/src/cpu/i386/entry32.inc
@@ -6,10 +6,10 @@
.code32
.align 4
-.globl EXT(gdtptr)
+.globl gdtptr
gdt:
-EXT(gdtptr):
+gdtptr:
.word gdt_end - gdt -1 /* compute the table limit */
.long gdt /* we know the offset */
.word 0
@@ -37,8 +37,8 @@ gdt_end:
* cache will be reloaded.
*/
.align 4
-.globl EXT(protected_start)
-EXT(protected_start):
+.globl protected_start
+protected_start:
lgdt %cs:gdtptr
ljmp $ROM_CODE_SEG, $__protected_start
diff --git a/src/cpu/i386/reset32.inc b/src/cpu/i386/reset32.inc
index ec743b70cc..42c68cc770 100644
--- a/src/cpu/i386/reset32.inc
+++ b/src/cpu/i386/reset32.inc
@@ -1,10 +1,10 @@
.section ".reset"
.code16
-.globl EXT(reset_vector)
-EXT(reset_vector):
+.globl reset_vector
+reset_vector:
. = 0x8;
.code32
- jmp EXT(protected_start)
+ jmp protected_start
.previous