From 62f80453279238c2fcc7a87035a8e27f69d21265 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 10 Dec 2019 08:23:21 +0000 Subject: [PATCH] Updated v6M startup. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13214 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- .../startup/ARMCMx/compilers/GCC/crt0_v6m.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S index 9d850e079..4adb573c6 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S +++ b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S @@ -211,9 +211,9 @@ endpsloop: #if CRT0_INIT_DATA == TRUE /* Data initialization. Note, it assumes that the DATA size is a multiple of 4 so the linker file must ensure this.*/ - ldr r1, =_textdata - ldr r2, =_data - ldr r3, =_edata + ldr r1, =__textdata_base__ + ldr r2, =__data_base__ + ldr r3, =__data_end__ dloop: cmp r2, r3 bge enddloop @@ -229,8 +229,8 @@ enddloop: /* BSS initialization. Note, it assumes that the DATA size is a multiple of 4 so the linker file must ensure this.*/ movs r0, #0 - ldr r1, =_bss_start - ldr r2, =_bss_end + ldr r1, =__bss_base__ + ldr r2, =__bss_end__ bloop: cmp r1, r2 bge endbloop @@ -250,8 +250,8 @@ endbloop: #if CRT0_CALL_CONSTRUCTORS == TRUE /* Constructors invocation.*/ - ldr r4, =__init_array_start - ldr r5, =__init_array_end + ldr r4, =__init_array_base__ + ldr r5, =__init_array_end__ initloop: cmp r4, r5 bge endinitloop @@ -267,8 +267,8 @@ endinitloop: #if CRT0_CALL_DESTRUCTORS == TRUE /* Destructors invocation.*/ - ldr r4, =__fini_array_start - ldr r5, =__fini_array_end + ldr r4, =__fini_array_base__ + ldr r5, =__fini_array_end__ finiloop: cmp r4, r5 bge endfiniloop