Skip to content

Commit 8392613

Browse files
authored
Merge pull request #11726 from kjbracey-arm/armc6_no_static_destructors
Disable C++ static destructors in ARMC6 compiler
2 parents 009ff7a + 1ecd960 commit 8392613

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tools/profiles/debug.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"-DMBED_DEBUG", "-DMBED_TRAP_ERRORS_ENABLED=1"],
2525
"asm": [],
2626
"c": ["-D__ASSERT_MSG", "-std=gnu11"],
27-
"cxx": ["-fno-rtti", "-std=gnu++14"],
27+
"cxx": ["-fno-rtti", "-fno-c++-static-destructors", "-std=gnu++14"],
2828
"ld": ["--verbose", "--remove", "--show_full_path", "--legacyalign",
2929
"--any_contingency", "--keep=os_cb_sections"]
3030
},

tools/profiles/develop.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"-DMBED_TRAP_ERRORS_ENABLED=1"],
2424
"asm": [],
2525
"c": ["-D__ASSERT_MSG", "-std=gnu11"],
26-
"cxx": ["-fno-rtti", "-std=gnu++14"],
26+
"cxx": ["-fno-rtti", "-fno-c++-static-destructors", "-std=gnu++14"],
2727
"ld": ["--show_full_path", "--legacyalign", "--any_contingency",
2828
"--keep=os_cb_sections"]
2929
},

tools/profiles/release.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"-DNDEBUG"],
2424
"asm": [],
2525
"c": ["-D__ASSERT_MSG", "-std=gnu11"],
26-
"cxx": ["-fno-rtti", "-std=gnu++14"],
26+
"cxx": ["-fno-rtti", "-fno-c++-static-destructors", "-std=gnu++14"],
2727
"ld": ["--show_full_path", "--legacyalign", "--any_contingency",
2828
"--keep=os_cb_sections"]
2929
},

0 commit comments

Comments
 (0)