commit 26c2f6835c09d68a7dc4871f7eb55f286e7dd810
author Christophe Favergeon <Christophe.Favergeon@arm.com> Fri Sep 06 14:43:32 2019 +0100
committer Christophe Favergeon <Christophe.Favergeon@arm.com> Fri Sep 06 14:43:32 2019 +0100
tree 246e03282a87221cfb47c9ab3245393ca007fe69
parent 6516e24bdb15a7eafd1e3091826b1b97238b89b0

CMSIS-DSP: Added support in test framework for ARMv81MML and FVP

CMSIS/DSP/Toolchain/AC6.cmake

diff --git a/CMSIS/DSP/Toolchain/AC6.cmake b/CMSIS/DSP/Toolchain/AC6.cmake
index cb7ec76..8604f0c 100644
--- a/CMSIS/DSP/Toolchain/AC6.cmake
+++ b/CMSIS/DSP/Toolchain/AC6.cmake
@@ -65,14 +65,22 @@
         target_compile_options(${PROJECTNAME} PUBLIC "-mfpu=vfpv4-d16")
       endif()
   endif()
+
+  if(EXPERIMENTAL)
+    experimentalCompilerSpecificCompileOptions(${PROJECTNAME} ${ROOT})
+  endif()
 endfunction()
 
 
-function(toolchainSpecificLinkForCortexM PROJECTNAME ROOT CORE PLATFORMFOLDER)
+function(toolchainSpecificLinkForCortexM PROJECTNAME ROOT CORE PLATFORMFOLDER HASCSTARTUP)
     # A specific library is created for ASM file
     # since we do not want standard compile flags (for C) to be applied to 
     # ASM files.
-    target_sources(${PROJECTNAME} PRIVATE ${PLATFORMFOLDER}/${CORE}/Startup/AC6/startup_${CORE}.s)
+    if (HASCSTARTUP)
+      target_sources(${PROJECTNAME} PRIVATE ${PLATFORMFOLDER}/${CORE}/Startup/AC6/startup_${CORE}.c)
+    else()
+      target_sources(${PROJECTNAME} PRIVATE ${PLATFORMFOLDER}/${CORE}/Startup/AC6/startup_${CORE}.s)
+    endif() 
     target_include_directories(${PROJECTNAME} PRIVATE ${PLATFORMFOLDER}/${CORE}/LinkScripts/AC6)
 
     set(SCATTERFILE "${PLATFORMFOLDER}/${CORE}/LinkScripts/AC6/lnk.sct")

CMSIS/DSP/Toolchain/GCC.cmake

diff --git a/CMSIS/DSP/Toolchain/GCC.cmake b/CMSIS/DSP/Toolchain/GCC.cmake
index 00b3766..6efee1a 100644
--- a/CMSIS/DSP/Toolchain/GCC.cmake
+++ b/CMSIS/DSP/Toolchain/GCC.cmake
@@ -92,7 +92,7 @@
     add_dependencies(${PROJECTNAME} scatter)
 endfunction()
 
-function(toolchainSpecificLinkForCortexM  PROJECTNAME ROOT CORE PLATFORMFOLDER)
+function(toolchainSpecificLinkForCortexM  PROJECTNAME ROOT CORE PLATFORMFOLDER HASCSTARTUP)
     target_sources(${PROJECTNAME} PRIVATE  ${PLATFORMFOLDER}/${CORE}/Startup/GCC/startup_${CORE}.S)
     target_sources(${PROJECTNAME} PRIVATE  ${PLATFORMFOLDER}/${CORE}/Startup/GCC/support.c)