Changeset 32573ff in mainline for boot/arch/ia64/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/ia64/src/asm.S (modified) (2 diffs)

boot/arch/ia64/src/asm.S

@@ -28 +28 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
 .text
 
-.global halt
-.global memcpy
-.global jump_to_kernel
+FUNCTION_BEGIN(halt)
+        br halt
+FUNCTION_END(halt)
 
-halt:
-        br halt
-
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
         alloc loc0 = ar.pfs, 1, 1, 0, 0
         mov r2 = in0 ;;                 # Pass bootinfo address
@@ -45 +43 @@
         mov b1 = r8 ;;
         br.call.sptk.many b0 = b1;;
+FUNCTION_END(jump_to_kernel)
+