From f58e600d6e426d8d3259976b6c0b7edd1d20a8f5 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Tue, 30 Apr 2019 14:10:22 +0300 Subject: [PATCH 1/3] Fix armclang fpu detection --- tools/toolchains/arm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index a54c27d945..2c621fb186 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -554,7 +554,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 == "Cortex-M4" or core == "Cortex-M7" or core == "Cortex-M33": self.flags['common'].append("-mfpu=none") elif core == "Cortex-M4F": self.flags['common'].append("-mfpu=fpv4-sp-d16") From 5f2991dcc79a3a1efc0e3d5300eeb118494c4a6c Mon Sep 17 00:00:00 2001 From: Alexander Zilberkant Date: Tue, 30 Apr 2019 14:48:38 +0300 Subject: [PATCH 2/3] Handle Cortex-M33E no-fpu flags Add compilation "-mfpu=none" flag for Cortex-M33E. --- tools/toolchains/arm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index 2c621fb186..5ebe50e05b 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -554,7 +554,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") From cae568ca07a01325e1270cd1eddc5be1505d5d47 Mon Sep 17 00:00:00 2001 From: Alexander Zilberkant Date: Tue, 30 Apr 2019 14:55:46 +0300 Subject: [PATCH 3/3] Add Cortex-M33E to cpu conversion table for ARMC6 --- tools/toolchains/arm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py index 5ebe50e05b..5fa1f70516 100644 --- a/tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -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()