From b8189096e5be33848372dca449d045c2ba25e812 Mon Sep 17 00:00:00 2001 From: Yilun Lin Date: Wed, 23 Jan 2019 17:02:42 +0800 Subject: link_defs.h: Renames __ro_end to __data_lma_start. The name of __ro_end is confusing. The variable is actually used as a label tagging that it is the starting address of .data LMA. Renames to __data_lma_start to be more decriptive. BRANCH=None TEST=make buildall -j BUG=b:122084384 Change-Id: I8990a2a1f3d0719739a8e649b881cb277fe5a9b8 Signed-off-by: Yilun Lin Reviewed-on: https://chromium-review.googlesource.com/1433160 Commit-Ready: Yilun Lin Tested-by: Yilun Lin Reviewed-by: Nicolas Boichat --- core/cortex-m/ec.lds.S | 2 +- core/cortex-m/init.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/cortex-m') diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 8bd5bfa21a..ef0a2a2dc9 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -271,7 +271,7 @@ SECTIONS #else } > FLASH #endif - __ro_end = . ; + __data_lma_start = . ; .bss : { /* diff --git a/core/cortex-m/init.S b/core/cortex-m/init.S index de869c61e7..a68bbf38b7 100644 --- a/core/cortex-m/init.S +++ b/core/cortex-m/init.S @@ -42,7 +42,7 @@ bss_loop: blt bss_loop /* Copy initialized data to Internal RAM */ - ldr r0,_ro_end + ldr r0,_data_lma_start ldr r1,_data_start ldr r2,_data_end data_loop: @@ -100,8 +100,8 @@ _data_start: .long __data_start _data_end: .long __data_end -_ro_end: -.long __ro_end +_data_lma_start: +.long __data_lma_start /* Dummy functions to avoid linker complaints */ .global __aeabi_unwind_cpp_pr0 -- cgit v1.2.1