Skip to content

Commit ee1d998

Browse files
adbridgeadbridge
authored
Merge pull request ARMmbed#12278 from rajkan01/feature_rename_default_lib
Rename "default_lib" to "c_lib".
2 parents 40a0b28 + e4f4ff2 commit ee1d998

File tree

34 files changed

+102
-90
lines changed

34 files changed

+102
-90
lines changed

‎TESTS/configs/baremetal.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@
3939
"mbed-trace.fea-ipv6": false
4040
},
4141
"K64F": {
42-
"target.default_lib": "small"
42+
"target.c_lib": "small"
4343
},
4444
"K66F": {
45-
"target.default_lib": "small"
45+
"target.c_lib": "small"
4646
},
4747
"NUCLEO_F303RE": {
48-
"target.default_lib": "small"
48+
"target.c_lib": "small"
4949
},
5050
"NUCLEO_F411RE": {
51-
"target.default_lib": "small"
51+
"target.c_lib": "small"
5252
},
5353
"NUCLEO_F429ZI": {
54-
"target.default_lib": "small"
54+
"target.c_lib": "small"
5555
},
5656
"DISCO_L475VG_IOT01A": {
57-
"target.default_lib": "small"
57+
"target.c_lib": "small"
5858
}
5959
}
6060
}

‎targets/targets.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"features": [],
1717
"detect_code": [],
1818
"public": false,
19-
"default_lib": "std",
19+
"c_lib": "std",
2020
"bootloader_supported": false,
2121
"static_memory_defines": true,
2222
"printf_lib": "std",
@@ -2441,8 +2441,7 @@
24412441
"TRNG",
24422442
"FLASH",
24432443
"WATCHDOG"
2444-
],
2445-
"default_lib": "std",
2444+
],
24462445
"release_versions": [
24472446
"2",
24482447
"5"
@@ -2465,8 +2464,7 @@
24652464
"FSL_RTOS_MBED",
24662465
"USE_EXTERNAL_RTC"
24672466
],
2468-
"default_toolchain": "ARM",
2469-
"default_lib": "std",
2467+
"default_toolchain": "ARM",
24702468
"forced_reset_timeout": 7,
24712469
"release_versions": [
24722470
"2",
@@ -14032,8 +14030,7 @@
1403214030
"smclk_select": "HFXT",
1403314031
"smclk_div": "DIV2",
1403414032
"adc_auto_scan": 1
14035-
},
14036-
"default_lib": "std",
14033+
},
1403714034
"release_versions": [
1403814035
"2",
1403914036
"5"

‎tools/build_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ def is_official_target(target_name, version):
335335
("following toolchains: %s" %
336336
", ".join(sorted(supported_toolchains)))
337337

338-
elif not target.default_lib == 'std':
338+
elif not target.c_lib == 'std':
339339
result = False
340340
reason = ("Target '%s' must set the " % target.name) + \
341-
("'default_lib' to 'std' to be included in the ") + \
341+
("'c_lib' to 'std' to be included in the ") + \
342342
("mbed OS 5.0 official release." + linesep) + \
343-
("Currently it is set to '%s'" % target.default_lib)
343+
("Currently it is set to '%s'" % target.c_lib)
344344

345345
else:
346346
result = False

‎tools/targets/lint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def check_device_has(dict):
9090
yield "%s is not allowed in device_has" % name
9191

9292
MCU_REQUIRED_KEYS = ["release_versions", "supported_toolchains",
93-
"default_lib", "public", "inherits", "device_has"]
93+
"c_lib", "public", "inherits", "device_has"]
9494
MCU_ALLOWED_KEYS = ["device_has_add", "device_has_remove", "core",
9595
"extra_labels", "features", "features_add",
9696
"features_remove", "bootloader_supported", "device_name",

‎tools/test/config/app_override_libs/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"core": "Cortex-M0",
44
"extra_labels": [],
55
"features": [],
6-
"default_lib": "std",
6+
"c_lib": "std",
77
"supported_toolchains": ["GCC_ARM"],
88
"supported_c_libs": {
99
"arm": ["std"],

‎tools/test/config/compound_inheritance/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/double_define/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"first_base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],
@@ -18,7 +18,7 @@
1818
"second_base": {
1919
"supported_toolchains": ["GCC_ARM"],
2020
"extra_labels": [],
21-
"default_lib": "std",
21+
"c_lib": "std",
2222
"supported_c_libs": {
2323
"arm": ["std"],
2424
"gcc_arm": ["std", "small"],

‎tools/test/config/feature_compesition/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/feature_recursive_add/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/feature_recursive_complex/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/feature_remove/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": ["BOOTLOADER"],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/lib_requires_missing_lib/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/macro_inheritance/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/override_labels_libs/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/override_labels_libs_more/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/override_labels_targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/override_precidence/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"core": "Cortex-M0",
77
"config": {
88
"par1": "v_par1_base",

‎tools/test/config/override_undefined/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"first_base_target": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/override_undefined_libs/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/override_with_labels/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/config/range_limits/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"core": "Cortex-M0",
44
"extra_labels": [],
55
"features": [],
6-
"default_lib": "std",
6+
"c_lib": "std",
77
"supported_c_libs": {
88
"arm": ["std"],
99
"gcc_arm": ["std", "small"],

‎tools/test/config/range_limits_invalid/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"core": "Cortex-M0",
44
"extra_labels": [],
55
"features": [],
6-
"default_lib": "std",
6+
"c_lib": "std",
77
"supported_toolchains": ["GCC_ARM"],
88
"supported_c_libs": {
99
"arm": ["std"],

‎tools/test/config/range_limits_override_invalid/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"core": "Cortex-M0",
44
"extra_labels": [],
55
"features": [],
6-
"default_lib": "std",
6+
"c_lib": "std",
77
"supported_c_libs": {
88
"arm": ["std"],
99
"gcc_arm": ["std", "small"],

‎tools/test/config/requires_exclude_in_include/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
1616
"core": "Cortex-M0",
1717
"extra_labels": [],
1818
"features": [],
19-
"default_lib": "std",
19+
"c_lib": "std",
2020
"supported_c_libs": {
2121
"arm": ["std"],
2222
"gcc_arm": ["std", "small"],

‎tools/test/config/requires_from_lib/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/requires_include_in_exclude/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
1616
"core": "Cortex-M0",
1717
"extra_labels": [],
1818
"features": [],
19-
"default_lib": "std",
19+
"c_lib": "std",
2020
"supported_c_libs": {
2121
"arm": ["std"],
2222
"gcc_arm": ["std", "small"],

‎tools/test/config/requires_omit_lib/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],
@@ -16,7 +16,7 @@
1616
"core": "Cortex-M0",
1717
"extra_labels": [],
1818
"features": [],
19-
"default_lib": "std",
19+
"c_lib": "std",
2020
"supported_c_libs": {
2121
"arm": ["std"],
2222
"gcc_arm": ["std", "small"],

‎tools/test/config/simple_features/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"core": "Cortex-M0",
55
"extra_labels": [],
66
"features": [],
7-
"default_lib": "std",
7+
"c_lib": "std",
88
"supported_c_libs": {
99
"arm": ["std"],
1010
"gcc_arm": ["std", "small"],

‎tools/test/config/simple_iheritance/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"first_base": {
33
"supported_toolchains": ["GCC_ARM"],
44
"extra_labels": [],
5-
"default_lib": "std",
5+
"c_lib": "std",
66
"supported_c_libs": {
77
"arm": ["std"],
88
"gcc_arm": ["std", "small"],

‎tools/test/targets/target_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_modify_existing_target():
102102
"features": [],
103103
"detect_code": [],
104104
"public": false,
105-
"default_lib": "std",
105+
"c_lib": "std",
106106
"supported_c_libs": {
107107
"arm": ["std"],
108108
"gcc_arm": ["std", "small"],
@@ -130,7 +130,7 @@ def test_modify_existing_target():
130130
"features": [],
131131
"detect_code": [],
132132
"public": false,
133-
"default_lib": "std",
133+
"c_lib": "std",
134134
"supported_c_libs": {
135135
"arm": ["std"],
136136
"gcc_arm": ["std", "small"],

0 commit comments

Comments
 (0)