Skip to content

Commit 479ab48

Browse files
DO NOT MERGE: Tmp commit to build with more compilers in CI to detect issues.
1 parent 9da1d9d commit 479ab48

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-20.04, macos-11, windows-2019]
14-
gcc: ['7-2017-q4', 'latest']
14+
gcc: ['7-2017-q4', '7-2018-q2', '8-2018-q4', '8-2019-q3', '9-2019-q4', '9-2020-q2', '10-2020-q4', '11.2-2022.02', 'latest']
1515
cmake: ['3.6.0', ''] # Empty string installs the latest CMake release
1616
fail-fast: false
1717
runs-on: ${{ matrix.os }}

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ if((CMAKE_VERSION VERSION_GREATER "3.4.0") OR (CMAKE_VERSION VERSION_EQUAL "3.4.
66
set(EXPLICIT_INCLUDES "<INCLUDES> ")
77
endif()
88

9+
10+
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER "9.0.0" OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL "9.0.0")
11+
# Some tools are not compatible with DWARF v5 yet
12+
set(DWARF_VERSION_FLAG "-gdwarf-4")
13+
message("USING DWARF v4 (${CMAKE_C_COMPILER_VERSION})")
14+
else()
15+
# Older gcc versions need to be configured with DWARF v3
16+
set(DWARF_VERSION_FLAG "-gdwarf-3")
17+
message("USING DWARF v3 (${CMAKE_C_COMPILER_VERSION})")
18+
endif()
19+
920
# Override the link rules:
1021
set(CMAKE_C_CREATE_SHARED_LIBRARY "echo 'shared libraries not supported' && 1")
1122
set(CMAKE_C_CREATE_SHARED_MODULE "echo 'shared modules not supported' && 1")
@@ -19,29 +30,29 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
1930
set(CMAKE_C_OUTPUT_EXTENSION ".o")
2031
set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
2132

22-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
23-
set(CMAKE_C_FLAGS_DEBUG_INIT "-g -gdwarf-4")
33+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
34+
set(CMAKE_C_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
2435
set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
2536
set(CMAKE_C_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
26-
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
37+
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
2738
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
2839

29-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
30-
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g -gdwarf-4")
40+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
41+
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
3142
set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
3243
set(CMAKE_ASM_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
33-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
44+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
3445
set(CMAKE_INCLUDE_SYSTEM_FLAG_ASM "-isystem ")
3546

3647
set(CMAKE_CXX_CREATE_STATIC_LIBRARY "<CMAKE_AR> -cr <LINK_FLAGS> <TARGET> <OBJECTS>")
3748

3849
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>")
3950

40-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
41-
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -gdwarf-4")
51+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
52+
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
4253
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
4354
set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
44-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
55+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
4556
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
4657

4758
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER "7.1.0" OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL "7.1.0")

0 commit comments

Comments
 (0)