Skip to content

Commit b172cd8

Browse files
committed
More fix for uARM build to avoid link error
1 parent b4de450 commit b172cd8

File tree

1 file changed

+3
-26
lines changed
  • libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11XX/TOOLCHAIN_ARM_MICRO

1 file changed

+3
-26
lines changed

libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11XX/TOOLCHAIN_ARM_MICRO/startup_LPC11xx.s

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -205,33 +205,10 @@ PIOINT0_IRQHandler
205205

206206
ENDP
207207

208-
209208
ALIGN
210209

211-
212-
; User Initial Stack & Heap
213-
214-
IF :DEF:__MICROLIB
215-
216-
EXPORT __initial_sp
217-
EXPORT __heap_base
218-
EXPORT __heap_limit
219-
220-
ELSE
221-
222-
IMPORT __use_two_region_memory
223-
EXPORT __user_initial_stackheap
224-
__user_initial_stackheap
225-
226-
LDR R0, = Heap_Mem
227-
LDR R1, =(Stack_Mem + Stack_Size)
228-
LDR R2, = (Heap_Mem + Heap_Size)
229-
LDR R3, = Stack_Mem
230-
BX LR
231-
232-
ALIGN
233-
234-
ENDIF
235-
210+
; @toyowata removed "User Initial Stack & Heap" block here,
211+
; since arm.py script doesn't pass -D__MICROLIB definision to armasm.
212+
; Now, required symbols (__initial_sp etc) were exported in this code.
236213

237214
END

0 commit comments

Comments
 (0)