Changeset 32573ff in mainline for boot/arch/mips32/src/asm.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:

• boot/arch/mips32/src/asm.S (modified) (4 diffs)

boot/arch/mips32/src/asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 #include <arch/regname.h>
@@ -34 +35 @@
 .set nomacro
 
-.global start
-.global halt
-.global jump_to_kernel
-
 .section BOOTSTRAP
 
-start:
+SYMBOL(start)
         /*
          * Setup the CP0 configuration
@@ -145 +142 @@
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
         j halt
         nop
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
         /*
          * TODO:
@@ -158 +156 @@
         j $a0
         nop
+FUNCTION_END(jump_to_kernel)