Skip to content

Commit 5bfdee6

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

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

.github/workflows/build.yml

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

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ 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 "8.3.1") OR (CMAKE_C_COMPILER_VERSION VERSION_EQUAL "8.3.1"))
11+
# Some tools are not compatible with DWARF v5 yet
12+
set(DWARF_VERSION_FLAG "-gdwarf-4")
13+
message("USING DWARF v4 (gcc ${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 (gcc ${CMAKE_C_COMPILER_VERSION})")
18+
endif()
19+
20+
921
# Override the link rules:
1022
set(CMAKE_C_CREATE_SHARED_LIBRARY "echo 'shared libraries not supported' && 1")
1123
set(CMAKE_C_CREATE_SHARED_MODULE "echo 'shared modules not supported' && 1")
@@ -19,29 +31,29 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
1931
set(CMAKE_C_OUTPUT_EXTENSION ".o")
2032
set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
2133

22-
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
23-
set(CMAKE_C_FLAGS_DEBUG_INIT "-g -gdwarf-4")
34+
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
35+
set(CMAKE_C_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
2436
set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
2537
set(CMAKE_C_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
26-
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
38+
set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
2739
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
2840

29-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
30-
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g -gdwarf-4")
41+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
42+
set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
3143
set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
3244
set(CMAKE_ASM_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
33-
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
45+
set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
3446
set(CMAKE_INCLUDE_SYSTEM_FLAG_ASM "-isystem ")
3547

3648
set(CMAKE_CXX_CREATE_STATIC_LIBRARY "<CMAKE_AR> -cr <LINK_FLAGS> <TARGET> <OBJECTS>")
3749

3850
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>")
3951

40-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -gdwarf-4")
41-
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -gdwarf-4")
52+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${DWARF_VERSION_FLAG}")
53+
set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g ${DWARF_VERSION_FLAG}")
4254
set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
4355
set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Os -DNDEBUG")
44-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g -gdwarf-4 -DNDEBUG")
56+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-Os -g ${DWARF_VERSION_FLAG} -DNDEBUG")
4557
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
4658

4759
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)