From 1c4b1e6f4ccb55ec35d2a207325fa55c52e7f5c4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Wed, 13 Feb 2019 12:31:42 -0800 Subject: [PATCH 1/2] Move __PRETTY_FUNCTION__ to progmem Match __FUNCTION__ linking, keep C++ function names out of rodata/heap. --- tools/sdk/ld/eagle.app.v6.common.ld.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h index d72a95d308..f312b32559 100644 --- a/tools/sdk/ld/eagle.app.v6.common.ld.h +++ b/tools/sdk/ld/eagle.app.v6.common.ld.h @@ -140,6 +140,7 @@ SECTIONS /* __FUNCTION__ locals */ *(.rodata._ZZ*__FUNCTION__) + *(.rodata._ZZ*__PRETTY_FUNCTION__) /* std::* exception strings, in their own section to allow string coalescing */ *(.irom.exceptiontext) From a61cb44e3e3a997af5725f92403f409cb2202fb4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Wed, 13 Feb 2019 12:39:07 -0800 Subject: [PATCH 2/2] Add __func__ handler, too. --- tools/sdk/ld/eagle.app.v6.common.ld.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/sdk/ld/eagle.app.v6.common.ld.h b/tools/sdk/ld/eagle.app.v6.common.ld.h index f312b32559..aa4201221c 100644 --- a/tools/sdk/ld/eagle.app.v6.common.ld.h +++ b/tools/sdk/ld/eagle.app.v6.common.ld.h @@ -141,6 +141,7 @@ SECTIONS /* __FUNCTION__ locals */ *(.rodata._ZZ*__FUNCTION__) *(.rodata._ZZ*__PRETTY_FUNCTION__) + *(.rodata._ZZ*__func__) /* std::* exception strings, in their own section to allow string coalescing */ *(.irom.exceptiontext)