espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cxx_exception_pool_4.2' into 'release/v4.2'

Browse Source 
startup: Make __cxx_eh_arena_size_get return 0 if exceptions disabled (v4.2)

See merge request espressif/esp-idf!18800
This commit is contained in:
David Čermák
2022-07-29 13:14:45 +08:00
parent 1801a10828 2bcfeb612f
commit 9003e6d1eb
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp32/cpu_start.c
View File

@ -532,12 +532,20 @@ void start_cpu1_default(void)
} }
#endif //!CONFIG_FREERTOS_UNICORE #endif //!CONFIG_FREERTOS_UNICORE
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS /**
* This function overwrites a the same function of libsupc++ (part of libstdc++).
* Consequently, libsupc++ will then follow our configured exception emergency pool size.
*
* It will be called even with -fno-exception for user code since the stdlib still uses exceptions.
*/
size_t __cxx_eh_arena_size_get(void) size_t __cxx_eh_arena_size_get(void)
{ {
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
return CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE; return CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE;
} #else
return 0;
#endif #endif
}
static void do_global_ctors(void) static void do_global_ctors(void)
{ {

12
components/esp32s2/cpu_start.c
View File

@ -395,12 +395,20 @@ void start_cpu0_default(void)
abort(); /* Only get to here if not enough free heap to start scheduler */ abort(); /* Only get to here if not enough free heap to start scheduler */
} }
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS /**
* This function overwrites a the same function of libsupc++ (part of libstdc++).
* Consequently, libsupc++ will then follow our configured exception emergency pool size.
*
* It will be called even with -fno-exception for user code since the stdlib still uses exceptions.
*/
size_t __cxx_eh_arena_size_get(void) size_t __cxx_eh_arena_size_get(void)
{ {
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
return CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE; return CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE;
} #else
return 0;
#endif #endif
}
static void do_global_ctors(void) static void do_global_ctors(void)
{ {