Skip to content

Commit d7c925d

Browse files
Cruz Monrreal IICruz Monrreal II
authored andcommitted
Removed extra ARMc6 instance in unique mapping
1 parent 48fa58b commit d7c925d

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

tools/build_api.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,8 +953,25 @@ def build_lib(lib_id, target, toolchain_name, clean=False, macros=None,
953953
# Let Exception propagate
954954
raise
955955

956-
# We do have unique legacy conventions about how we build and package the mbed
957-
# library
956+
# A number of compiled files need to be copied as objects as the linker
957+
# will not search for weak symbol overrides in archives. These are:
958+
# - mbed_retarget.o: to make sure that the C standard lib symbols get
959+
# overridden
960+
# - mbed_board.o: `mbed_die` is weak
961+
# - mbed_overrides.o: this contains platform overrides of various
962+
# weak SDK functions
963+
# - mbed_main.o: this contains main redirection
964+
# - mbed_sdk_boot.o: this contains the main boot code in
965+
# - PeripheralPins.o: PinMap can be weak
966+
SEPARATE_NAMES = [
967+
'PeripheralPins.o',
968+
'mbed_retarget.o',
969+
'mbed_board.o',
970+
'mbed_overrides.o',
971+
'mbed_main.o',
972+
'mbed_sdk_boot.o',
973+
]
974+
958975
def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
959976
notify=None, jobs=1, report=None, properties=None,
960977
build_profile=None, ignore=None):
@@ -1134,9 +1151,6 @@ def get_unique_supported_toolchains(release_targets=None):
11341151
if toolchain not in unique_supported_toolchains:
11351152
unique_supported_toolchains.append(toolchain)
11361153

1137-
if "ARM" in unique_supported_toolchains:
1138-
unique_supported_toolchains.append("ARMC6")
1139-
11401154
return unique_supported_toolchains
11411155

11421156

0 commit comments

Comments
 (0)