Skip to content

Commit 261e9f2

Browse files
committed
Correct fpu passing for Armlink 6
1 parent ba01a02 commit 261e9f2

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

tools/toolchains/arm.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,16 +310,12 @@ def __init__(self, target, *args, **kwargs):
310310

311311
if target.core.lower().endswith("fd"):
312312
self.flags['common'].append("-mcpu=%s" % target.core.lower()[:-2])
313-
self.flags['ld'].append("--cpu=%s" % target.core.lower()[:-2])
314313
elif target.core.lower().endswith("f"):
315314
self.flags['common'].append("-mcpu=%s" % target.core.lower()[:-1])
316-
self.flags['ld'].append("--cpu=%s" % target.core.lower()[:-1])
317315
elif target.core.lower().endswith("ns"):
318316
self.flags['common'].append("-mcpu=%s" % target.core.lower()[:-3])
319-
self.flags['ld'].append("--cpu=%s" % target.core.lower()[:-3])
320317
else:
321318
self.flags['common'].append("-mcpu=%s" % target.core.lower())
322-
self.flags['ld'].append("--cpu=%s" % target.core.lower())
323319

324320
if target.core == "Cortex-M4F":
325321
self.flags['common'].append("-mfpu=fpv4-sp-d16")
@@ -347,6 +343,7 @@ def __init__(self, target, *args, **kwargs):
347343
"Cortex-M33-NS": "Cortex-M33" }.get(target.core, target.core)
348344

349345
self.flags['asm'].append("--cpu=%s" % asm_cpu)
346+
self.flags['ld'].append("--cpu=%s" % asm_cpu)
350347

351348
self.cc = ([join(TOOLCHAIN_PATHS["ARMC6"], "armclang")] +
352349
self.flags['common'] + self.flags['c'])

0 commit comments

Comments
 (0)