Skip to content

Commit 7101e92

Browse files
authored
Merge pull request ARMmbed#12303 from rajkan01/fix_micro_lib_warning
Fix ARM compiler warning for microlib
2 parents 8b25c51 + fe470d9 commit 7101e92

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

tools/test/toolchains/test_toolchains.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ def test_arm_c_lib(self):
6464

6565
self.assertIn("--library_type=microlib", arm_std_obj.flags["ld"])
6666
self.assertIn("--library_type=microlib", arm_micro_obj.flags["ld"])
67-
self.assertIn("--library_type=microlib", arm_c6_obj.flags["ld"])
68-
69-
self.assertIn("-Wl,--library_type=microlib", arm_c6_obj.flags["cxx"])
67+
self.assertIn("--library_type=microlib", arm_c6_obj.flags["ld"])
7068
self.assertIn("--library_type=microlib", arm_c6_obj.flags["asm"])
7169

7270
def test_arm_c_lib_std_exception(self):

tools/toolchains/arm.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,10 +581,6 @@ def __init__(self, target, *args, **kwargs):
581581
self.flags['common'].append("-D__MICROLIB")
582582
if "--library_type=microlib" not in self.flags['ld']:
583583
self.flags['ld'].append("--library_type=microlib")
584-
if "-Wl,--library_type=microlib" not in self.flags['c']:
585-
self.flags['c'].append("-Wl,--library_type=microlib")
586-
if "-Wl,--library_type=microlib" not in self.flags['cxx']:
587-
self.flags['cxx'].append("-Wl,--library_type=microlib")
588584
if "--library_type=microlib" not in self.flags['asm']:
589585
self.flags['asm'].append("--library_type=microlib")
590586

0 commit comments

Comments
 (0)