kopia lustrzana https://github.com/espressif/esp-idf
feat(cxx): get rid of _Unwind_SetEnableExceptionFdeSorting
rodzic
4f09fba127
commit
4ac07fc575
|
@ -12,7 +12,6 @@ idf_component_register(SRCS "cxx_exception_stubs.cpp"
|
||||||
|
|
||||||
if(NOT CONFIG_CXX_EXCEPTIONS)
|
if(NOT CONFIG_CXX_EXCEPTIONS)
|
||||||
set(WRAP_FUNCTIONS
|
set(WRAP_FUNCTIONS
|
||||||
_Unwind_SetEnableExceptionFdeSorting
|
|
||||||
__register_frame_info_bases
|
__register_frame_info_bases
|
||||||
__register_frame_info
|
__register_frame_info
|
||||||
__register_frame
|
__register_frame
|
||||||
|
|
|
@ -35,11 +35,6 @@ static T abort_return()
|
||||||
}
|
}
|
||||||
|
|
||||||
// unwind-dw2-fde.o
|
// unwind-dw2-fde.o
|
||||||
extern "C" void __wrap__Unwind_SetEnableExceptionFdeSorting(unsigned char enable)
|
|
||||||
{
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
|
|
||||||
extern "C" void __wrap___register_frame_info_bases(const void *begin, struct object *ob, void *tbase, void *dbase)
|
extern "C" void __wrap___register_frame_info_bases(const void *begin, struct object *ob, void *tbase, void *dbase)
|
||||||
{
|
{
|
||||||
abort();
|
abort();
|
||||||
|
|
|
@ -12,18 +12,6 @@ namespace {
|
||||||
const char *TAG = "C++ init";
|
const char *TAG = "C++ init";
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
|
||||||
// workaround for C++ exception large memory allocation
|
|
||||||
extern "C" void _Unwind_SetEnableExceptionFdeSorting(unsigned char enable);
|
|
||||||
|
|
||||||
ESP_SYSTEM_INIT_FN(init_cxx_exceptions, SECONDARY, BIT(0), 205)
|
|
||||||
{
|
|
||||||
ESP_EARLY_LOGD(TAG, "Setting C++ exception workarounds.");
|
|
||||||
_Unwind_SetEnableExceptionFdeSorting(0);
|
|
||||||
return ESP_OK;
|
|
||||||
}
|
|
||||||
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function overwrites the same function of libsupc++ (part of libstdc++).
|
* This function overwrites the same function of libsupc++ (part of libstdc++).
|
||||||
* Consequently, libsupc++ will then follow our configured exception emergency pool size.
|
* Consequently, libsupc++ will then follow our configured exception emergency pool size.
|
||||||
|
|
|
@ -87,7 +87,6 @@ SECONDARY: 140: init_dbg_stubs in components/app_trace/debug_stubs.c on BIT(0)
|
||||||
SECONDARY: 201: init_pm in components/esp_system/startup_funcs.c on BIT(0)
|
SECONDARY: 201: init_pm in components/esp_system/startup_funcs.c on BIT(0)
|
||||||
SECONDARY: 203: init_apb_dma in components/esp_system/startup_funcs.c on BIT(0)
|
SECONDARY: 203: init_apb_dma in components/esp_system/startup_funcs.c on BIT(0)
|
||||||
SECONDARY: 204: init_coexist in components/esp_system/startup_funcs.c on BIT(0)
|
SECONDARY: 204: init_coexist in components/esp_system/startup_funcs.c on BIT(0)
|
||||||
SECONDARY: 205: init_cxx_exceptions in components/cxx/cxx_init.cpp on BIT(0)
|
|
||||||
|
|
||||||
# usb_console needs to create an esp_timer at startup.
|
# usb_console needs to create an esp_timer at startup.
|
||||||
# This can be done only after esp_timer initialization (esp_timer_init_os).
|
# This can be done only after esp_timer initialization (esp_timer_init_os).
|
||||||
|
|
Ładowanie…
Reference in New Issue