From d77729589f266bb89022e0e806d9a8303b3277a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Nilsson?= Date: Wed, 17 Aug 2022 02:33:56 +0200 Subject: [PATCH] Fix build issues for variants of TARGET_ARCH=cortex-m7+fp BUG=fixes https://github.com/tensorflow/tflite-micro/issues/1356 --- .../tools/make/targets/cortex_m_corstone_300_makefile.inc | 2 +- .../micro/tools/make/targets/cortex_m_generic_makefile.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tensorflow/lite/micro/tools/make/targets/cortex_m_corstone_300_makefile.inc b/tensorflow/lite/micro/tools/make/targets/cortex_m_corstone_300_makefile.inc index 398a0b44..21597c4b 100644 --- a/tensorflow/lite/micro/tools/make/targets/cortex_m_corstone_300_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/cortex_m_corstone_300_makefile.inc @@ -176,7 +176,7 @@ CXXFLAGS += -D$(ARM_CPU)$(CMSIS_ARM_FEATURES) CCFLAGS += -D$(ARM_CPU)$(CMSIS_ARM_FEATURES) # For Ethos-U Core Driver. Header file name is depending on target architecture. -CXXFLAGS += -DCMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE=\"$(ARM_CPU).h\" +CXXFLAGS += -DCMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE=\"$(ARM_CPU)$(CMSIS_ARM_FEATURES).h\" THIRD_PARTY_CC_SRCS += \ $(ETHOS_U_CORE_PLATFORM)/retarget.c \ diff --git a/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc b/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc index 3193043f..02fbd150 100644 --- a/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc @@ -1,4 +1,4 @@ -# Copyright 2021 The TensorFlow Authors. All Rights Reserved. +# Copyright 2022 The TensorFlow Authors. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,6 +86,7 @@ else ifeq ($(TARGET_ARCH), cortex-m7+fp) ARM_LDFLAGS := -Wl,--cpu=Cortex-M7 FLOAT=hard GCC_TARGET_ARCH := cortex-m7 + CMSIS_ARM_FEATURES := _DP else ifeq ($(TARGET_ARCH), cortex-m85) CORE=M85 -- GitLab