Changeset 054476d in mainline for boot

Timestamp:

2016-04-21T20:04:16Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

27f67f5

Parents:

dc0d8b52 (diff), 73b3ecd (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 arm32 switch over to using asmtool.h macros

Location:

boot

Files:

• Makefile.build (modified) (3 diffs)
• arch/arm32/src/asm.S (modified) (2 diffs)
• arch/arm32/src/eabi.S (modified) (5 diffs)

boot/Makefile.build

@@ -31 +31 @@
 include Makefile.common
 
-INCLUDES = generic/include
+INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
 OPTIMIZATION = 3
 
@@ -38 +38 @@
 LFLAGS = --fatal-warnings
 
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -45 +45 @@
         -pipe
 
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
         -Werror-implicit-function-declaration -wd170
 
-CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \

boot/arch/arm32/src/asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
 .section BOOTSTRAP
 
-.global start
-.global boot_pt
-.global boot_stack
-.global halt
-.global jump_to_kernel
-
-start:
+SYMBOL(start)
         ldr sp, =boot_stack
         b bootstrap
 
 .section BOOTPT
-boot_pt:
+SYMBOL(boot_pt)
         .space PTL0_ENTRIES * PTL0_ENTRY_SIZE
 
 .section BOOTSTACK
         .space 4096
-boot_stack:
+SYMBOL(boot_stack)
 
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
         b halt
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
         #
         # Make sure that the I-cache, D-cache and memory are mutually coherent
@@ -108 +104 @@
 #endif
         mov pc, r0
+FUNCTION_END(jump_to_kernel)
+

boot/arch/arm32/src/eabi.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global __aeabi_idiv
-.global __aeabi_uidiv
-
-.global __aeabi_idivmod
-.global __aeabi_uidivmod
-
-.global __aeabi_ldivmod
-.global __aeabi_uldivmod
-
-__aeabi_idiv:
+FUNCTION_BEGIN(__aeabi_idiv)
         push {lr}
         bl __divsi3
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_idiv)
 
-__aeabi_uidiv:
+FUNCTION_BEGIN(__aeabi_uidiv)
         push {lr}
         bl __udivsi3
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_uidiv)
 
-__aeabi_idivmod:
+FUNCTION_BEGIN(__aeabi_idivmod)
         push {lr}
         sub sp, sp, #12
@@ -59 +54 @@
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_idivmod)
 
-__aeabi_uidivmod:
+FUNCTION_BEGIN(__aeabi_uidivmod)
         push {lr}
         sub sp, sp, #12
@@ -69 +65 @@
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_uidivmod)
 
-__aeabi_ldivmod:
+FUNCTION_BEGIN(__aeabi_ldivmod)
         push {lr}
         sub sp, sp, #24
@@ -80 +77 @@
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_ldivmod)
 
-__aeabi_uldivmod:
+FUNCTION_BEGIN(__aeabi_uldivmod)
         push {lr}
         sub sp, sp, #24
@@ -91 +89 @@
         pop {lr}
         mov pc, lr
+FUNCTION_END(__aeabi_uldivmod)
+