Merge pull request #12303 from rajkan01/fix_micro_lib_warning

Fix ARM compiler warning for microlib
pull/12324/head
Anna Bridge 2020-01-24 14:58:18 +00:00 committed by GitHub
commit 7101e92d12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions

View File

@ -64,9 +64,7 @@ class TestArmToolchain(TestCase):
self.assertIn("--library_type=microlib", arm_std_obj.flags["ld"])
self.assertIn("--library_type=microlib", arm_micro_obj.flags["ld"])
self.assertIn("--library_type=microlib", arm_c6_obj.flags["ld"])
self.assertIn("-Wl,--library_type=microlib", arm_c6_obj.flags["cxx"])
self.assertIn("--library_type=microlib", arm_c6_obj.flags["ld"])
self.assertIn("--library_type=microlib", arm_c6_obj.flags["asm"])
def test_arm_c_lib_std_exception(self):

View File

@ -581,10 +581,6 @@ class ARMC6(ARM_STD):
self.flags['common'].append("-D__MICROLIB")
if "--library_type=microlib" not in self.flags['ld']:
self.flags['ld'].append("--library_type=microlib")
if "-Wl,--library_type=microlib" not in self.flags['c']:
self.flags['c'].append("-Wl,--library_type=microlib")
if "-Wl,--library_type=microlib" not in self.flags['cxx']:
self.flags['cxx'].append("-Wl,--library_type=microlib")
if "--library_type=microlib" not in self.flags['asm']:
self.flags['asm'].append("--library_type=microlib")