Skip to content

Commit 6e38ef8

Browse files
Set debug DWARF v4 & rm usage of CMAKE_<LANG>_FLAGS_<CONFIG>_INIT.
The _INIT variables were introduced in CMake 3.11, and this project currently supports 3.6+. The CMAKE_<LANG>_FLAGS_<CONFIG> are reset here instead of using _INIT, as we want these to be the starting values, overwritting any CMake defaults. Debug info set to DWARF v4 because some tooling does not process v5 yet.
1 parent efd034a commit 6e38ef8

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

utils/cmake/toolchains/ARM_GCC/compiler-flags.cmake

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
1919
set(CMAKE_C_OUTPUT_EXTENSION ".o")
2020
set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
2121

22-
set(CMAKE_C_FLAGS_DEBUG_INIT "-g -gdwarf-3")
23-
set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
24-
set(CMAKE_C_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
25-
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG")
22+
set(CMAKE_C_FLAGS_DEBUG "-g -gdwarf-4")
23+
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
24+
set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG")
25+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g -gdwarf-4")
2626
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
2727

2828

29-
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g -gdwarf-3")
30-
set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
31-
set(CMAKE_ASM_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
32-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG")
29+
set(CMAKE_ASM_FLAGS_DEBUG "-g -gdwarf-4")
30+
set(CMAKE_ASM_FLAGS_MINSIZEREL "-Os -DNDEBUG")
31+
set(CMAKE_ASM_FLAGS_RELEASE "-Os -DNDEBUG")
32+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g -gdwarf-4")
3333
set(CMAKE_INCLUDE_SYSTEM_FLAG_ASM "-isystem ")
3434

3535
set(CMAKE_CXX_CREATE_STATIC_LIBRARY "<CMAKE_AR> -cr <LINK_FLAGS> <TARGET> <OBJECTS>")
3636

3737
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -Wl,-Map,<TARGET>.map -Wl,--start-group <OBJECTS> <LINK_LIBRARIES> -lnosys -lstdc++ -lsupc++ -lm -lc -lgcc -lstdc++ -lsupc++ -lm -lc -lgcc -Wl,--end-group --specs=nano.specs -o <TARGET>")
3838

39-
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -gdwarf-3")
40-
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
41-
set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
42-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-3 -DNDEBUG")
39+
set(CMAKE_CXX_FLAGS_DEBUG "-g -gdwarf-4")
40+
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
41+
set(CMAKE_CXX_FLAGS_RELEASE "-Os -DNDEBUG")
42+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os -DNDEBUG -g -gdwarf-4")
4343
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
4444

4545
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER "7.1.0" OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL "7.1.0")
4646
message("${BoldRed}Supressing -Wexpansion-to-defined.${ColourReset}")
4747
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
4848
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
49-
endif ()
49+
endif ()

utils/cmake/toolchains/AVR_GCC/compiler-flags.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is using CMAKE_<LANG>_FLAGS_<CONFIG>_INIT introduced in 3.11
2+
cmake_minimum_required(VERSION 3.11)
3+
14
set(EXPLICIT_INCLUDES "")
25
if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0"))
36
# from CMake 3.4 <INCLUDES> are separate to <FLAGS> in the

utils/cmake/toolchains/XTENSA_GCC/compiler-flags.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is using CMAKE_<LANG>_FLAGS_<CONFIG>_INIT introduced in 3.11
2+
cmake_minimum_required(VERSION 3.11)
3+
14
set(EXPLICIT_INCLUDES "")
25
if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.0"))
36
# from CMake 3.4 <INCLUDES> are separate to <FLAGS> in the

0 commit comments

Comments
 (0)