From dae64c4dae293172e469962a5bae8b66b204adc5 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Tue, 28 May 2019 11:48:59 -0700 Subject: [PATCH] Move umm_malloc back to IRAM (#6161) As found by @mhightower83, umm_malloc was placed in flash during the .c->.cpp conversion because of a missed linker change. Adjust the link script to the new name .cpp --- tools/sdk/ld/eagle.app.v6.common.ld.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h index cc9b3f356..97aa390a2 100644 --- a/tools/sdk/ld/eagle.app.v6.common.ld.h +++ b/tools/sdk/ld/eagle.app.v6.common.ld.h @@ -135,8 +135,8 @@ SECTIONS { _irom0_text_start = ABSOLUTE(.); *(.ver_number) - *.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, EXCLUDE_FILE (umm_malloc.c.o) .text* ) - *.cpp.o(.literal*, .text*) + *.c.o(.literal*, .text*) + *.cpp.o(EXCLUDE_FILE (umm_malloc.cpp.o) .literal*, EXCLUDE_FILE (umm_malloc.cpp.o) .text*) *.cc.o(.literal*, .text*) #ifdef VTABLES_IN_FLASH *(.rodata._ZTV*) /* C++ vtables */