Build system improvement.

diff --git a/toolchain/arm-sim.cmake b/toolchain/arm-sim.cmake
index bfa1c8861bdaab3d3573cb58f89bba9a4c336224..9eeda9533d86e4a281cf9eb165c34ee25b4ebb29 100644 (file)
--- a/toolchain/arm-sim.cmake
+++ b/toolchain/arm-sim.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR arm-sim)
 \r
 set(MCPU_FLAGS "")\r
 set(VFP_FLAGS "")\r
-set(SIM_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group")\r
+set(LD_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group")\r
 \r
 include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake)
\ No newline at end of file

diff --git a/toolchain/common/arm-none-eabi.cmake b/toolchain/common/arm-none-eabi.cmake
index b5c9e78b30357588d9cf83d2c96be7003d42c8fd..f7e130edaf12621c0fbf0ca4ae0935ffcc4c4827 100644 (file)
--- a/toolchain/common/arm-none-eabi.cmake
+++ b/toolchain/common/arm-none-eabi.cmake
@@ -10,7 +10,7 @@ set(SIZE                arm-none-eabi-size)
 set(CMAKE_C_FLAGS   "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -std=gnu99 -fdata-sections -ffunction-sections" CACHE INTERNAL "c compiler flags")\r
 set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags")\r
 set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")\r
-set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections ${SIM_FLAGS}" CACHE INTERNAL "exe link flags")\r
+set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags")\r
 \r
 \r
 \r

diff --git a/toolchain/cortex-m0.cmake b/toolchain/cortex-m0.cmake
index 90863d373dc0839ca484a923d121697cb92b42a4..2536a879674516601bf89fe2e1653ed18ac18605 100644 (file)
--- a/toolchain/cortex-m0.cmake
+++ b/toolchain/cortex-m0.cmake
@@ -4,5 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m0)
 \r
 set(MCPU_FLAGS "-mthumb -mcpu=cortex-m0")\r
 set(VFP_FLAGS "")\r
+set(LD_FLAGS "-nostartfiles")\r
 \r
 include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake)
\ No newline at end of file

diff --git a/toolchain/cortex-m3.cmake b/toolchain/cortex-m3.cmake
index 94c31eebf71cdd5a14df6d52aaf10ce2d5357990..0b601530ccd6a87d7ae0aaac628b936f43bef20c 100644 (file)
--- a/toolchain/cortex-m3.cmake
+++ b/toolchain/cortex-m3.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m3)
 \r
 set(MCPU_FLAGS "-mthumb -mcpu=cortex-m3")\r
 set(VFP_FLAGS "")\r
-\r
+set(LD_FLAGS "-nostartfiles")\r
 \r
 include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake)
\ No newline at end of file

diff --git a/toolchain/cortex-m4.cmake b/toolchain/cortex-m4.cmake
index 697376a85f1f16e3f1f765c474525928fd96eb53..0d06ec361ea2f1276c97e227c8eb0080a59334c0 100644 (file)
--- a/toolchain/cortex-m4.cmake
+++ b/toolchain/cortex-m4.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m4)
 \r
 set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4")\r
 set(VFP_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16")\r
-\r
+set(LD_FLAGS "-nostartfiles")\r
 \r
 include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake)
\ No newline at end of file