Skip to content

Commit 5f8aa89

Browse files
theotherjimmy0xc0170
theotherjimmy
authored and
0xc0170
committed
Partial revert of "CMSIS/RTX: Adapt Mbed OS to CMSIS/RTX device support scheme"
1 parent dc946b3 commit 5f8aa89

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎tools/profiles/debug.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"-ffunction-sections", "-fdata-sections", "-funsigned-char",
77
"-MMD", "-fno-delete-null-pointer-checks",
88
"-fomit-frame-pointer", "-O0", "-g3", "-DMBED_DEBUG",
9-
"-DMBED_TRAP_ERRORS_ENABLED=1", "-D_RTE_"],
9+
"-DMBED_TRAP_ERRORS_ENABLED=1"],
1010
"asm": ["-x", "assembler-with-cpp"],
1111
"c": ["-std=gnu99"],
1212
"cxx": ["-std=gnu++98", "-fno-rtti", "-Wvla"],
@@ -19,7 +19,7 @@
1919
"common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-g", "-O0",
2020
"-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
2121
"-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
22-
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=", "-D_RTE_"],
22+
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)="],
2323
"asm": [],
2424
"c": ["-D__ASSERT_MSG", "-std=gnu99"],
2525
"cxx": ["-fno-rtti", "-std=gnu++98"],
@@ -30,7 +30,7 @@
3030
"common": ["-c", "--gnu", "-Otime", "--split_sections",
3131
"--apcs=interwork", "--brief_diagnostics", "--restrict",
3232
"--multibyte_chars", "-O0", "-g", "-DMBED_DEBUG",
33-
"-DMBED_TRAP_ERRORS_ENABLED=1", "-D_RTE_"],
33+
"-DMBED_TRAP_ERRORS_ENABLED=1"],
3434
"asm": [],
3535
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
3636
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -41,7 +41,7 @@
4141
"--apcs=interwork", "--brief_diagnostics", "--restrict",
4242
"--multibyte_chars", "-O0", "-D__MICROLIB", "-g",
4343
"--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-DMBED_DEBUG",
44-
"-DMBED_TRAP_ERRORS_ENABLED=1", "-D_RTE_"],
44+
"-DMBED_TRAP_ERRORS_ENABLED=1"],
4545
"asm": [],
4646
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
4747
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -51,7 +51,7 @@
5151
"common": [
5252
"--no_wrap_diagnostics", "-e",
5353
"--diag_suppress=Pa050,Pa084,Pa093,Pa082", "-On", "-r", "-DMBED_DEBUG",
54-
"-DMBED_TRAP_ERRORS_ENABLED=1", "--enable_restrict", "-D_RTE_"],
54+
"-DMBED_TRAP_ERRORS_ENABLED=1", "--enable_restrict"],
5555
"asm": [],
5656
"c": ["--vla", "--diag_suppress=Pe546"],
5757
"cxx": ["--guard_calls", "--no_static_destruction"],

‎tools/profiles/develop.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"-fmessage-length=0", "-fno-exceptions", "-fno-builtin",
66
"-ffunction-sections", "-fdata-sections", "-funsigned-char",
77
"-MMD", "-fno-delete-null-pointer-checks",
8-
"-fomit-frame-pointer", "-Os", "-g1", "-D_RTE_"],
8+
"-fomit-frame-pointer", "-Os", "-g1"],
99
"asm": ["-x", "assembler-with-cpp"],
1010
"c": ["-std=gnu99"],
1111
"cxx": ["-std=gnu++98", "-fno-rtti", "-Wvla"],
@@ -18,7 +18,7 @@
1818
"common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Os",
1919
"-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
2020
"-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
21-
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=", "-D_RTE_"],
21+
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)="],
2222
"asm": [],
2323
"c": ["-D__ASSERT_MSG", "-std=gnu99"],
2424
"cxx": ["-fno-rtti", "-std=gnu++98"],
@@ -27,7 +27,7 @@
2727
"ARM": {
2828
"common": ["-c", "--gnu", "-Otime", "--split_sections",
2929
"--apcs=interwork", "--brief_diagnostics", "--restrict",
30-
"--multibyte_chars", "-O3", "-D_RTE_"],
30+
"--multibyte_chars", "-O3"],
3131
"asm": [],
3232
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
3333
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -37,7 +37,7 @@
3737
"common": ["-c", "--gnu", "-Otime", "--split_sections",
3838
"--apcs=interwork", "--brief_diagnostics", "--restrict",
3939
"--multibyte_chars", "-O3", "-D__MICROLIB",
40-
"--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-D_RTE_"],
40+
"--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD"],
4141
"asm": [],
4242
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
4343
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -46,7 +46,7 @@
4646
"IAR": {
4747
"common": [
4848
"--no_wrap_diagnostics", "-e",
49-
"--diag_suppress=Pa050,Pa084,Pa093,Pa082", "-Oh", "--enable_restrict", "-D_RTE_"],
49+
"--diag_suppress=Pa050,Pa084,Pa093,Pa082", "-Oh", "--enable_restrict"],
5050
"asm": [],
5151
"c": ["--vla", "--diag_suppress=Pe546"],
5252
"cxx": ["--guard_calls", "--no_static_destruction"],

‎tools/profiles/release.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"-fmessage-length=0", "-fno-exceptions", "-fno-builtin",
66
"-ffunction-sections", "-fdata-sections", "-funsigned-char",
77
"-MMD", "-fno-delete-null-pointer-checks",
8-
"-fomit-frame-pointer", "-Os", "-DNDEBUG", "-g1", "-D_RTE_"],
8+
"-fomit-frame-pointer", "-Os", "-DNDEBUG", "-g1"],
99
"asm": ["-x", "assembler-with-cpp"],
1010
"c": ["-std=gnu99"],
1111
"cxx": ["-std=gnu++98", "-fno-rtti", "-Wvla"],
@@ -18,7 +18,7 @@
1818
"common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Oz",
1919
"-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
2020
"-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
21-
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=", "-D_RTE_"],
21+
"-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)="],
2222
"asm": [],
2323
"c": ["-D__ASSERT_MSG", "-std=gnu99"],
2424
"cxx": ["-fno-rtti", "-std=gnu++98"],
@@ -28,7 +28,7 @@
2828
"ARM": {
2929
"common": ["-c", "--gnu", "-Ospace", "--split_sections",
3030
"--apcs=interwork", "--brief_diagnostics", "--restrict",
31-
"--multibyte_chars", "-O3", "-DNDEBUG", "-D_RTE_"],
31+
"--multibyte_chars", "-O3", "-DNDEBUG"],
3232
"asm": [],
3333
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
3434
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -38,7 +38,7 @@
3838
"common": ["-c", "--gnu", "-Ospace", "--split_sections",
3939
"--apcs=interwork", "--brief_diagnostics", "--restrict",
4040
"--multibyte_chars", "-O3", "-D__MICROLIB",
41-
"--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-DNDEBUG", "-D_RTE_"],
41+
"--library_type=microlib", "-DMBED_RTOS_SINGLE_THREAD", "-DNDEBUG"],
4242
"asm": [],
4343
"c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
4444
"cxx": ["--cpp", "--no_rtti", "--no_vla"],
@@ -47,7 +47,7 @@
4747
"IAR": {
4848
"common": [
4949
"--no_wrap_diagnostics", "-e",
50-
"--diag_suppress=Pa050,Pa084,Pa093,Pa082", "-Ohz", "-DNDEBUG", "--enable_restrict", "-D_RTE_"],
50+
"--diag_suppress=Pa050,Pa084,Pa093,Pa082", "-Ohz", "-DNDEBUG", "--enable_restrict"],
5151
"asm": [],
5252
"c": ["--vla", "--diag_suppress=Pe546"],
5353
"cxx": ["--guard_calls", "--no_static_destruction"],

0 commit comments

Comments
 (0)