Rename and move CortexContextSwitch files.

lancaster-university · Jul 5, 2019 · 4f1a31f · 4f1a31f
1 parent 5b015a3
commit 4f1a31f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -86,17 +86,15 @@ if (YOTTA_CFG_MICROBIT_CONFIGFILE)
 endif ()
 
 if(CMAKE_COMPILER_IS_GNUCC)
-  file(REMOVE "asm/CortexContextSwitch.s")
-  configure_file("asm/CortexContextSwitch.s.gcc" "asm/CortexContextSwitch.s" COPYONLY)
+  set(YOTTA_AUTO_MICROBIT-DAL_S_FILES
+    "asm/TOOLCHAIN_GCC_ARM/CortexContextSwitch.s"
+  )
 else()
-  file(REMOVE "asm/CortexContextSwitch.s")
-  configure_file("asm/CortexContextSwitch.s.armcc" "asm/CortexContextSwitch.s" COPYONLY)
+  set(YOTTA_AUTO_MICROBIT-DAL_S_FILES
+    "asm/TOOLCHAIN_ARM_STD/CortexContextSwitch.S"
+  )
 endif()
 
-set(YOTTA_AUTO_MICROBIT-DAL_S_FILES
-    "asm/CortexContextSwitch.s"
-)
-
 add_library(microbit-dal
     ${YOTTA_AUTO_MICROBIT-DAL_CPP_FILES}
     ${YOTTA_AUTO_MICROBIT-DAL_S_FILES}

diff --git a/source/asm/CortexContextSwitch.s.armcc → ...m/TOOLCHAIN_ARM_STD/CortexContextSwitch.S b/source/asm/CortexContextSwitch.s.armcc → ...m/TOOLCHAIN_ARM_STD/CortexContextSwitch.S
diff --git a/source/asm/CortexContextSwitch.s.gcc → ...m/TOOLCHAIN_GCC_ARM/CortexContextSwitch.s b/source/asm/CortexContextSwitch.s.gcc → ...m/TOOLCHAIN_GCC_ARM/CortexContextSwitch.s