Merge branch 'refactor/xtensa_default_vectors' into 'master'

Xtensa: Move default vectors back into xtensa_vectors.S Closes IDF-7022 See merge request espressif/esp-idf!20512
espressif · Mar 10, 2023 · a8948eb · a8948eb
2 parents ed97d23 + 29ec3fb
commit a8948eb
Show file tree

Hide file tree

Showing 5 changed files with 530 additions and 479 deletions.
diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
@@ -81,7 +81,6 @@ if(CONFIG_IDF_TARGET_ARCH_XTENSA)
         "${kernel_dir}/portable/${arch}/xtensa_context.S"
         "${kernel_dir}/portable/${arch}/xtensa_init.c"
         "${kernel_dir}/portable/${arch}/xtensa_overlay_os_hook.c"
-        "${kernel_dir}/portable/${arch}/xtensa_vector_defaults.S"
         "${kernel_dir}/portable/${arch}/xtensa_vectors.S")
 endif()
 

diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_vector_defaults.S b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_vector_defaults.S