Skip to content

Commit 2c796e8

Browse files
hugueskambahugueskamba
committed
CMake: Remove unsupported ARM toolchain support
1 parent f71edbf commit 2c796e8

File tree

4 files changed

+136
-258
lines changed

4 files changed

+136
-258
lines changed

‎cmake/profiles/debug.cmake

Lines changed: 49 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -7,102 +7,57 @@ set(DEBUG_DEFINITIONS
77
)
88

99
if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
10-
11-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
12-
-c \
13-
-g3 \
14-
-std=gnu11 \
15-
")
16-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
17-
-c \
18-
-g3 \
19-
-std=gnu++14 \
20-
-fno-rtti \
21-
-Wvla \
22-
")
23-
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
24-
-c \
25-
-g3 \
26-
-x assembler-with-cpp \
27-
")
28-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
29-
-Wl,--gc-sections \
30-
-Wl,--wrap,main \
31-
-Wl,--wrap,_malloc_r \
32-
-Wl,--wrap,_free_r \
33-
-Wl,--wrap,_realloc_r \
34-
-Wl,--wrap,_memalign_r \
35-
-Wl,--wrap,_calloc_r \
36-
-Wl,--wrap,exit \
37-
-Wl,--wrap,atexit \
38-
-Wl,-n \
39-
")
40-
41-
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
42-
43-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
44-
-std=gnu11 \
45-
")
46-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
47-
-fno-rtti \
48-
-fno-c++-static-destructors \
49-
-std=gnu++14 \
50-
")
51-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
52-
--verbose \
53-
--remove \
54-
--show_full_path \
55-
--legacyalign \
56-
--any_contingency \
57-
--keep=os_cb_sections \
58-
")
59-
set(DEBUG_DEFINITIONS ${DEBUG_DEFINITIONS}
60-
-D__ASSERT_MSG
61-
-DMULADDC_CANNOT_USE_R7
62-
)
10+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
11+
-c \
12+
-g3 \
13+
-std=gnu11 \
14+
")
15+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
16+
-c \
17+
-g3 \
18+
-std=gnu++14 \
19+
-fno-rtti \
20+
-Wvla \
21+
")
22+
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
23+
-c \
24+
-g3 \
25+
-x assembler-with-cpp \
26+
")
27+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
28+
-Wl,--gc-sections \
29+
-Wl,--wrap,main \
30+
-Wl,--wrap,_malloc_r \
31+
-Wl,--wrap,_free_r \
32+
-Wl,--wrap,_realloc_r \
33+
-Wl,--wrap,_memalign_r \
34+
-Wl,--wrap,_calloc_r \
35+
-Wl,--wrap,exit \
36+
-Wl,--wrap,atexit \
37+
-Wl,-n \
38+
")
6339

6440
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
65-
66-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
67-
--md \
68-
--no_depend_system_headers \
69-
--c99 \
70-
")
71-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
72-
--cpp11 \
73-
--no_rtti \
74-
--no_vla \
75-
")
76-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
77-
--show_full_path \
78-
--any_contingency \
79-
--keep=os_cb_sections \
80-
")
81-
set(DEBUG_DEFINITIONS ${DEBUG_DEFINITIONS}
82-
-D__ASSERT_MSG
83-
)
84-
85-
elseif(MBED_TOOLCHAIN STREQUAL "uARM")
86-
87-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
88-
--md \
89-
--no_depend_system_headers \
90-
--c99 \
91-
")
92-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
93-
--cpp11 \
94-
--no_rtti \
95-
--no_vla \
96-
")
97-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
98-
--library_type=microlib \
99-
")
100-
set(DEBUG_DEFINITIONS ${DEBUG_DEFINITIONS}
101-
-D__ASSERT_MSG
102-
-DMBED_RTOS_SINGLE_THREAD
103-
-D__MICROLIB
104-
)
105-
41+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
42+
-std=gnu11 \
43+
")
44+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
45+
-fno-rtti \
46+
-fno-c++-static-destructors \
47+
-std=gnu++14 \
48+
")
49+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
50+
--verbose \
51+
--remove \
52+
--show_full_path \
53+
--legacyalign \
54+
--any_contingency \
55+
--keep=os_cb_sections \
56+
")
57+
set(DEBUG_DEFINITIONS ${DEBUG_DEFINITIONS}
58+
-D__ASSERT_MSG
59+
-DMULADDC_CANNOT_USE_R7
60+
)
10661
endif()
10762

10863
add_definitions(${DEBUG_DEFINITIONS})

‎cmake/profiles/develop.cmake

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,51 @@ set(DEVELOP_DEFINITIONS
77

88
if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
99

10-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
11-
-c \
12-
-std=gnu11 \
13-
")
14-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
15-
-std=gnu++14 \
16-
-fno-rtti \
17-
-Wvla \
18-
")
19-
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
20-
-x assembler-with-cpp \
21-
")
22-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
23-
-Wl,--gc-sections \
24-
-Wl,--wrap,main \
25-
-Wl,--wrap,_malloc_r \
26-
-Wl,--wrap,_free_r \
27-
-Wl,--wrap,_realloc_r \
28-
-Wl,--wrap,_memalign_r \
29-
-Wl,--wrap,_calloc_r \
30-
-Wl,--wrap,exit \
31-
-Wl,--wrap,atexit \
32-
-Wl,-n \
33-
")
34-
35-
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
36-
37-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
10+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
11+
-c \
3812
-std=gnu11 \
39-
")
40-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
41-
-fno-rtti \
42-
-fno-c++-static-destructors \
13+
")
14+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
4315
-std=gnu++14 \
44-
")
45-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
46-
--show_full_path \
47-
--legacyalign \
48-
--inline \
49-
--any_contingency \
50-
--keep=os_cb_sections \
51-
")
52-
53-
set(DEVELOP_DEFINITIONS ${DEVELOP_DEFINITIONS}
54-
-D__ASSERT_MSG
55-
)
16+
-fno-rtti \
17+
-Wvla \
18+
")
19+
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
20+
-x assembler-with-cpp \
21+
")
22+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
23+
-Wl,--gc-sections \
24+
-Wl,--wrap,main \
25+
-Wl,--wrap,_malloc_r \
26+
-Wl,--wrap,_free_r \
27+
-Wl,--wrap,_realloc_r \
28+
-Wl,--wrap,_memalign_r \
29+
-Wl,--wrap,_calloc_r \
30+
-Wl,--wrap,exit \
31+
-Wl,--wrap,atexit \
32+
-Wl,-n \
33+
")
5634

35+
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
36+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
37+
-std=gnu11 \
38+
")
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
40+
-fno-rtti \
41+
-fno-c++-static-destructors \
42+
-std=gnu++14 \
43+
")
44+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
45+
--show_full_path \
46+
--legacyalign \
47+
--inline \
48+
--any_contingency \
49+
--keep=os_cb_sections \
50+
")
51+
52+
set(DEVELOP_DEFINITIONS ${DEVELOP_DEFINITIONS}
53+
-D__ASSERT_MSG
54+
)
5755
endif()
5856

5957
add_definitions(${DEVELOP_DEFINITIONS})

‎cmake/profiles/release.cmake

Lines changed: 45 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,100 +6,52 @@ set(RELEASE_DEFINITIONS
66
)
77

88
if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
9-
10-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
11-
-c \
12-
-std=gnu11 \
13-
")
14-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
15-
-c \
16-
-std=gnu++14 \
17-
-fno-rtti \
18-
-Wvla \
19-
")
20-
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
21-
-c \
22-
-x assembler-with-cpp \
23-
")
24-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
25-
-Wl,--gc-sections \
26-
-Wl,--wrap,main \
27-
-Wl,--wrap,_malloc_r \
28-
-Wl,--wrap,_free_r \
29-
-Wl,--wrap,_realloc_r \
30-
-Wl,--wrap,_memalign_r \
31-
-Wl,--wrap,_calloc_r \
32-
-Wl,--wrap,exit \
33-
-Wl,--wrap,atexit \
34-
-Wl,-n \
35-
")
36-
37-
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
38-
39-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
40-
-std=gnu11 \
41-
")
42-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
43-
-fno-rtti \
44-
-fno-c++-static-destructors \
45-
-std=gnu++14 \
46-
")
47-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
48-
--show_full_path \
49-
--legacyalign \
50-
--inline \
51-
--any_contingency \
52-
--keep=os_cb_sections \
53-
")
54-
55-
set(RELEASE_DEFINITIONS ${RELEASE_DEFINITIONS}
56-
-D__ASSERT_MSG
57-
)
58-
9+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
10+
-c \
11+
-std=gnu11 \
12+
")
13+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
14+
-c \
15+
-std=gnu++14 \
16+
-fno-rtti \
17+
-Wvla \
18+
")
19+
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
20+
-c \
21+
-x assembler-with-cpp \
22+
")
23+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
24+
-Wl,--gc-sections \
25+
-Wl,--wrap,main \
26+
-Wl,--wrap,_malloc_r \
27+
-Wl,--wrap,_free_r \
28+
-Wl,--wrap,_realloc_r \
29+
-Wl,--wrap,_memalign_r \
30+
-Wl,--wrap,_calloc_r \
31+
-Wl,--wrap,exit \
32+
-Wl,--wrap,atexit \
33+
-Wl,-n \
34+
")
5935
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
60-
61-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
62-
--md \
63-
--no_depend_system_headers \
64-
--c99 \
65-
")
66-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
67-
--cpp11 \
68-
--no_rtti \
69-
--no_vla \
70-
")
71-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
72-
--show_full_path \
73-
--any_contingency \
74-
--inline \
75-
--keep=os_cb_sections \
76-
")
77-
78-
set(RELEASE_DEFINITIONS ${RELEASE_DEFINITIONS}
79-
-D__ASSERT_MSG
80-
)
81-
82-
elseif(MBED_TOOLCHAIN STREQUAL "uARM")
83-
84-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
85-
--md \
86-
--no_depend_system_headers \
87-
--c99 \
88-
")
89-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
90-
--cpp11 \
91-
--no_rtti \
92-
--no_vla \
93-
")
94-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
95-
--inline \
96-
--library_type=microlib \
97-
")
98-
99-
set(RELEASE_DEFINITIONS ${RELEASE_DEFINITIONS}
100-
-D__ASSERT_MSG
101-
)
102-
36+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
37+
-std=gnu11 \
38+
")
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
40+
-fno-rtti \
41+
-fno-c++-static-destructors \
42+
-std=gnu++14 \
43+
")
44+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
45+
--show_full_path \
46+
--legacyalign \
47+
--inline \
48+
--any_contingency \
49+
--keep=os_cb_sections \
50+
")
51+
52+
set(RELEASE_DEFINITIONS ${RELEASE_DEFINITIONS}
53+
-D__ASSERT_MSG
54+
)
10355
endif()
10456

10557
add_definitions(${RELEASE_DEFINITIONS})

0 commit comments

Comments
 (0)