Changeset 32573ff in mainline for kernel/arch/mips32/src/start.S

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline, which has dltest and fixes.

File:

• kernel/arch/mips32/src/start.S (modified) (6 diffs)

kernel/arch/mips32/src/start.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/asm/regname.h>
 #include <arch/mm/page.h>
@@ -38 +39 @@
 .set noreorder
 .set nomacro
-
-.global kernel_image_start
-.global tlb_refill_entry
-.global cache_error_entry
-.global exception_entry
-.global userspace_asm
 
 /*
@@ -192 +187 @@
 
 .org 0x0
-kernel_image_start:
+SYMBOL(kernel_image_start)
         /* load temporary stack */
         lui $sp, %hi(end_stack)
@@ -210 +205 @@
 end_stack:
 
-tlb_refill_entry:
+SYMBOL(tlb_refill_entry)
         j tlb_refill_handler
         nop
 
-cache_error_entry:
+SYMBOL(cache_error_entry)
         j cache_error_handler
         nop
 
-exception_entry:
+SYMBOL(exception_entry)
         j exception_handler
         nop
@@ -345 +340 @@
         eret
 
-userspace_asm:
+FUNCTION_BEGIN(userspace_asm)
         move $sp, $a0
         move $v0, $a1
@@ -352 +347 @@
                            /* set it to 0 */
         eret
+FUNCTION_END(userspace_asm)