From b81655333f0a7378eec66cfef668a7282d7a4b17 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Tue, 15 Nov 2011 08:39:01 -0500 Subject: Remove "CS3" prefix from libmaple symbol names. We're no longer even marginally compatible with CS3, so it's inappropriate to use that prefix in our names. Rename: __cs3_stm32_vector_table -> __stm32_vector_table. __cs3_stack -> __msp_init __cs3_reset -> __exc_reset __cs3_start_c -> start_c Also add an MIT license header and assert LeafLabs copyright over wirish/start.S and wirish/start_c.c. These files are modified from the original CodeSourcery versions, which were distributed under a license that permits modifications to be distributed under a different copyright and licensing terms than the originals. Signed-off-by: Marti Bolivar --- support/ld/common.inc | 14 +++++++------- support/ld/stm32/f1/performance/vector_symbols.inc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'support') diff --git a/support/ld/common.inc b/support/ld/common.inc index 0d1f4ed..926f9eb 100644 --- a/support/ld/common.inc +++ b/support/ld/common.inc @@ -22,21 +22,21 @@ GROUP(libgcc.a libc.a libm.a) INCLUDE vector_symbols.inc /* STM32 vector table. */ -EXTERN(__cs3_stm32_vector_table) +EXTERN(__stm32_vector_table) -/* libcs3 C start function. */ -EXTERN(__cs3_start_c) +/* C runtime initialization function. */ +EXTERN(start_c) /* main entry point */ EXTERN(main) /* Initial stack pointer value. */ -EXTERN(__cs3_stack) -PROVIDE(__cs3_stack = ORIGIN(ram) + LENGTH(ram)); +EXTERN(__msp_init) +PROVIDE(__msp_init = ORIGIN(ram) + LENGTH(ram)); /* Reset vector and chip reset entry point */ EXTERN(_start) -PROVIDE(__cs3_reset = _start); +PROVIDE(__exc_reset = _start); /* Heap boundaries, for libmaple */ EXTERN(_lm_heap_start); @@ -162,7 +162,7 @@ SECTIONS * to go about this. [mbolivar] */ _lm_heap_start = DEFINED(_lm_heap_start) ? _lm_heap_start : _end; - _lm_heap_end = DEFINED(_lm_heap_end) ? _lm_heap_end : __cs3_stack; + _lm_heap_end = DEFINED(_lm_heap_end) ? _lm_heap_end : __msp_init; . = ALIGN (8); _edata = .; } > REGION_DATA AT> REGION_TEXT diff --git a/support/ld/stm32/f1/performance/vector_symbols.inc b/support/ld/stm32/f1/performance/vector_symbols.inc index 6d7ff6e..f8519bb 100644 --- a/support/ld/stm32/f1/performance/vector_symbols.inc +++ b/support/ld/stm32/f1/performance/vector_symbols.inc @@ -1,5 +1,5 @@ -EXTERN(__cs3_stack) -EXTERN(__cs3_reset) +EXTERN(__msp_init) +EXTERN(__exc_reset) EXTERN(__exc_nmi) EXTERN(__exc_hardfault) EXTERN(__exc_memmanage) -- cgit v1.2.3