diff --git a/components/cxx/CMakeLists.txt b/components/cxx/CMakeLists.txt index a6e61100fc..228414599c 100644 --- a/components/cxx/CMakeLists.txt +++ b/components/cxx/CMakeLists.txt @@ -12,7 +12,6 @@ idf_component_register(SRCS "cxx_exception_stubs.cpp" if(NOT CONFIG_CXX_EXCEPTIONS) set(WRAP_FUNCTIONS - _Unwind_SetEnableExceptionFdeSorting __register_frame_info_bases __register_frame_info __register_frame diff --git a/components/cxx/cxx_exception_stubs.cpp b/components/cxx/cxx_exception_stubs.cpp index 168d9dae2c..827d40dd81 100644 --- a/components/cxx/cxx_exception_stubs.cpp +++ b/components/cxx/cxx_exception_stubs.cpp @@ -35,11 +35,6 @@ static T abort_return() } // 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) { abort(); diff --git a/components/cxx/cxx_init.cpp b/components/cxx/cxx_init.cpp index 1819e5b7b2..bfff600583 100644 --- a/components/cxx/cxx_init.cpp +++ b/components/cxx/cxx_init.cpp @@ -12,18 +12,6 @@ namespace { 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++). * Consequently, libsupc++ will then follow our configured exception emergency pool size. diff --git a/components/esp_system/system_init_fn.txt b/components/esp_system/system_init_fn.txt index beb3c458df..0761eaedca 100644 --- a/components/esp_system/system_init_fn.txt +++ b/components/esp_system/system_init_fn.txt @@ -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: 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: 205: init_cxx_exceptions in components/cxx/cxx_init.cpp on BIT(0) # usb_console needs to create an esp_timer at startup. # This can be done only after esp_timer initialization (esp_timer_init_os).