Merge pull request #10513 from kfnta/armc6_m33_nofpu

Fix ARMC6 fpu detection for M33 core
pull/10527/head
Anna Bridge 2019-05-01 12:01:39 +01:00 committed by GitHub
commit 5dab1e4999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -547,6 +547,7 @@ class ARMC6(ARM_STD):
"Cortex-M7FD": "cortex-m7",
"Cortex-M33": "cortex-m33+nodsp",
"Cortex-M33F": "cortex-m33+nodsp",
"Cortex-M33E": "cortex-m33",
"Cortex-M33FE": "cortex-m33"}.get(core, core)
cpu = cpu.lower()
@ -554,7 +555,7 @@ class ARMC6(ARM_STD):
self.SHEBANG += " -mcpu=%s" % cpu
# FPU handling
if core == "Cortex-M4" or core == "Cortex-M7" or "core" == "Cortex-M33":
if core in ["Cortex-M4", "Cortex-M7", "Cortex-M33", "Cortex-M33E"]:
self.flags['common'].append("-mfpu=none")
elif core == "Cortex-M4F":
self.flags['common'].append("-mfpu=fpv4-sp-d16")