Rename "default_lib" to "c_lib".

rajkan01 · rajkan01 · commit 8a0fdd24d907 · 2020-01-17T08:05:48.000-08:00
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
@@ -39,22 +39,22 @@
             "mbed-trace.fea-ipv6": false
         },
         "K64F": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         },
         "K66F": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         },
         "NUCLEO_F303RE": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         },
         "NUCLEO_F411RE": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         },
         "NUCLEO_F429ZI": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         },
         "DISCO_L475VG_IOT01A": {
-            "target.default_lib": "small"
+            "target.c_lib": "small"
         }
      }
 }
diff --git a/targets/targets.json b/targets/targets.json
@@ -16,7 +16,7 @@
         "features": [],
         "detect_code": [],
         "public": false,
-        "default_lib": "std",
+        "c_lib": "std",
         "bootloader_supported": false,
         "static_memory_defines": true,
         "printf_lib": "std",
diff --git a/tools/build_api.py b/tools/build_api.py
@@ -335,12 +335,12 @@ def is_official_target(target_name, version):
                     ("following toolchains: %s" %
                      ", ".join(sorted(supported_toolchains)))
 
-            elif not target.default_lib == 'std':
+            elif not target.c_lib == 'std':
                 result = False
                 reason = ("Target '%s' must set the " % target.name) + \
-                    ("'default_lib' to 'std' to be included in the ") + \
+                    ("'c_lib' to 'std' to be included in the ") + \
                     ("mbed OS 5.0 official release." + linesep) + \
-                    ("Currently it is set to '%s'" % target.default_lib)
+                    ("Currently it is set to '%s'" % target.c_lib)
 
         else:
             result = False
diff --git a/tools/targets/lint.py b/tools/targets/lint.py
@@ -90,7 +90,7 @@ def check_device_has(dict):
             yield "%s is not allowed in device_has" % name
 
 MCU_REQUIRED_KEYS = ["release_versions", "supported_toolchains",
-                     "default_lib", "public", "inherits", "device_has"]
+                     "c_lib", "public", "inherits", "device_has"]
 MCU_ALLOWED_KEYS = ["device_has_add", "device_has_remove", "core",
                     "extra_labels", "features", "features_add",
                     "features_remove", "bootloader_supported", "device_name",
diff --git a/tools/test/config/app_override_libs/targets.json b/tools/test/config/app_override_libs/targets.json
@@ -3,7 +3,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_toolchains": ["GCC_ARM"],
         "supported_c_libs": {
                 "arm": ["std"],
diff --git a/tools/test/config/compound_inheritance/targets.json b/tools/test/config/compound_inheritance/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/double_define/targets.json b/tools/test/config/double_define/targets.json
@@ -2,7 +2,7 @@
     "first_base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
@@ -18,7 +18,7 @@
     "second_base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/feature_compesition/targets.json b/tools/test/config/feature_compesition/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/feature_recursive_add/targets.json b/tools/test/config/feature_recursive_add/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/feature_recursive_complex/targets.json b/tools/test/config/feature_recursive_complex/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/feature_remove/targets.json b/tools/test/config/feature_remove/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": ["BOOTLOADER"],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/lib_requires_missing_lib/targets.json b/tools/test/config/lib_requires_missing_lib/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/macro_inheritance/targets.json b/tools/test/config/macro_inheritance/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_labels_libs/targets.json b/tools/test/config/override_labels_libs/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_labels_libs_more/targets.json b/tools/test/config/override_labels_libs_more/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_labels_targets/targets.json b/tools/test/config/override_labels_targets/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_precidence/targets.json b/tools/test/config/override_precidence/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "core": "Cortex-M0",
         "config": {
             "par1": "v_par1_base",
diff --git a/tools/test/config/override_undefined/targets.json b/tools/test/config/override_undefined/targets.json
@@ -2,7 +2,7 @@
     "first_base_target": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_undefined_libs/targets.json b/tools/test/config/override_undefined_libs/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/override_with_labels/targets.json b/tools/test/config/override_with_labels/targets.json
@@ -2,7 +2,7 @@
     "base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/range_limits/targets.json b/tools/test/config/range_limits/targets.json
@@ -3,7 +3,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/range_limits_invalid/targets.json b/tools/test/config/range_limits_invalid/targets.json
@@ -3,7 +3,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_toolchains": ["GCC_ARM"],
         "supported_c_libs": {
                 "arm": ["std"],
diff --git a/tools/test/config/range_limits_override_invalid/targets.json b/tools/test/config/range_limits_override_invalid/targets.json
@@ -3,7 +3,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/requires_exclude_in_include/targets.json b/tools/test/config/requires_exclude_in_include/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/requires_from_lib/targets.json b/tools/test/config/requires_from_lib/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/requires_include_in_exclude/targets.json b/tools/test/config/requires_include_in_exclude/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/requires_omit_lib/targets.json b/tools/test/config/requires_omit_lib/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/simple_features/targets.json b/tools/test/config/simple_features/targets.json
@@ -4,7 +4,7 @@
         "core": "Cortex-M0",
         "extra_labels": [],
         "features": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/config/simple_iheritance/targets.json b/tools/test/config/simple_iheritance/targets.json
@@ -2,7 +2,7 @@
     "first_base": {
         "supported_toolchains": ["GCC_ARM"],
         "extra_labels": [],
-        "default_lib": "std",
+        "c_lib": "std",
         "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/targets/target_test.py b/tools/test/targets/target_test.py
@@ -102,7 +102,7 @@ def test_modify_existing_target():
             "features": [],
             "detect_code": [],
             "public": false,
-            "default_lib": "std",
+            "c_lib": "std",
             "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
@@ -130,7 +130,7 @@ def test_modify_existing_target():
             "features": [],
             "detect_code": [],
             "public": false,
-            "default_lib": "std",
+            "c_lib": "std",
             "supported_c_libs": {
                 "arm": ["std"],
                 "gcc_arm": ["std", "small"],
diff --git a/tools/test/toolchains/test_toolchains.py b/tools/test/toolchains/test_toolchains.py
diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py
diff --git a/tools/toolchains/gcc.py b/tools/toolchains/gcc.py
diff --git a/tools/toolchains/mbed_toolchain.py b/tools/toolchains/mbed_toolchain.py
