From 65d2139dc6df94358d72bc113b24795993d6c7ed Mon Sep 17 00:00:00 2001 From: Marek Matej Date: Tue, 21 Jan 2025 22:37:37 +0100 Subject: [PATCH] lib: libc: malloc.c: fix calculation of sys heap Change the condition so that ESP32 SoCs are using `_heap_sentry` to get actual run-time heap size. Signed-off-by: Marek Matej --- lib/libc/common/source/stdlib/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/common/source/stdlib/malloc.c b/lib/libc/common/source/stdlib/malloc.c index a75b028000d..2b01e152f00 100644 --- a/lib/libc/common/source/stdlib/malloc.c +++ b/lib/libc/common/source/stdlib/malloc.c @@ -101,8 +101,8 @@ static POOL_SECTION unsigned char __aligned(HEAP_ALIGN) malloc_arena[HEAP_SIZE]; # define HEAP_BASE ROUND_UP(USED_RAM_END_ADDR, HEAP_ALIGN) -# if defined(CONFIG_XTENSA) && (defined(CONFIG_SOC_FAMILY_INTEL_ADSP) \ - || defined(CONFIG_HAS_ESPRESSIF_HAL)) +# if (defined(CONFIG_XTENSA) && defined(CONFIG_SOC_FAMILY_INTEL_ADSP)) \ + || defined(CONFIG_HAS_ESPRESSIF_HAL) extern char _heap_sentry[]; # define HEAP_SIZE ROUND_DOWN((POINTER_TO_UINT(_heap_sentry) - HEAP_BASE), HEAP_ALIGN) # else