diff --git a/components/esp_common/CMakeLists.txt b/components/esp_common/CMakeLists.txt
index e82222a5f4..c2b6586437 100644
--- a/components/esp_common/CMakeLists.txt
+++ b/components/esp_common/CMakeLists.txt
@@ -7,7 +7,6 @@ if(BOOTLOADER_BUILD)
 else()
     # Regular app build
     set(srcs "src/dbg_stubs.c"
-             "src/esp_espression_with_stack_asm.S"
              "src/esp_err_to_name.c"
              "src/esp_timer.c"
              "src/ets_timer_legacy.c"
diff --git a/components/xtensa/CMakeLists.txt b/components/xtensa/CMakeLists.txt
index 5c335ffddc..6b4d2429c8 100644
--- a/components/xtensa/CMakeLists.txt
+++ b/components/xtensa/CMakeLists.txt
@@ -5,6 +5,7 @@ else()
     set(priv_requires soc freertos)
     set(srcs "debug_helpers.c"
              "debug_helpers_asm.S"
+             "expression_with_stack_xtensa.S"             
              "eri.c"
              )
 
diff --git a/components/esp_common/src/esp_espression_with_stack_asm.S b/components/xtensa/expression_with_stack_xtensa.S
similarity index 100%
rename from components/esp_common/src/esp_espression_with_stack_asm.S
rename to components/xtensa/expression_with_stack_xtensa.S