summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorgkostka <kostka.grzegorz@gmail.com>2014-06-03 10:59:40 +0000
committergkostka <kostka.grzegorz@gmail.com>2014-06-03 10:59:40 +0000
commit902a5091914e0c77c478101e4cdeaea84aff02e6 (patch)
treedef8b784eeb7225ad51e7b6988554e035dc0aaf5 /toolchain
parentcbf74d6c41613815366711a6a5322033c7c0ccc1 (diff)
Build system improvement.
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/arm-sim.cmake2
-rw-r--r--toolchain/common/arm-none-eabi.cmake2
-rw-r--r--toolchain/cortex-m0.cmake1
-rw-r--r--toolchain/cortex-m3.cmake2
-rw-r--r--toolchain/cortex-m4.cmake2
5 files changed, 5 insertions, 4 deletions
diff --git a/toolchain/arm-sim.cmake b/toolchain/arm-sim.cmake
index bfa1c88..9eeda95 100644
--- a/toolchain/arm-sim.cmake
+++ b/toolchain/arm-sim.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR arm-sim)
set(MCPU_FLAGS "")
set(VFP_FLAGS "")
-set(SIM_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group")
+set(LD_FLAGS "--specs=rdimon.specs -Wl,--start-group -lgcc -lc -lm -lrdimon -Wl,--end-group")
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 b5c9e78..f7e130e 100644
--- 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")
set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -Wall -fno-builtin -fdata-sections -ffunction-sections" CACHE INTERNAL "cxx compiler flags")
set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
-set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} -nostartfiles -Wl,--gc-sections ${SIM_FLAGS}" CACHE INTERNAL "exe link flags")
+set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags")
diff --git a/toolchain/cortex-m0.cmake b/toolchain/cortex-m0.cmake
index 90863d3..2536a87 100644
--- a/toolchain/cortex-m0.cmake
+++ b/toolchain/cortex-m0.cmake
@@ -4,5 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m0)
set(MCPU_FLAGS "-mthumb -mcpu=cortex-m0")
set(VFP_FLAGS "")
+set(LD_FLAGS "-nostartfiles")
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 94c31ee..0b60153 100644
--- a/toolchain/cortex-m3.cmake
+++ b/toolchain/cortex-m3.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m3)
set(MCPU_FLAGS "-mthumb -mcpu=cortex-m3")
set(VFP_FLAGS "")
-
+set(LD_FLAGS "-nostartfiles")
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 697376a..0d06ec3 100644
--- a/toolchain/cortex-m4.cmake
+++ b/toolchain/cortex-m4.cmake
@@ -4,6 +4,6 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m4)
set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4")
set(VFP_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16")
-
+set(LD_FLAGS "-nostartfiles")
include(${CMAKE_CURRENT_LIST_DIR}/common/arm-none-eabi.cmake) \ No newline at end of file