CMSIS-DSP:Some corrections to cmake build system.
diff --git a/CMSIS/DSP/Source/CMakeLists.txt b/CMSIS/DSP/Source/CMakeLists.txt
index c7c3531..0041aaf 100755
--- a/CMSIS/DSP/Source/CMakeLists.txt
+++ b/CMSIS/DSP/Source/CMakeLists.txt
@@ -7,7 +7,6 @@
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/..)
-option(FASTMATHCOMPUTATIONS "Fast Math enabled" ON)
option(NEON "Neon acceleration" OFF)
option(NEONEXPERIMENTAL "Neon experimental acceleration" OFF)
option(LOOPUNROLL "Loop unrolling" ON)
diff --git a/CMSIS/DSP/Testing/.gitignore b/CMSIS/DSP/Testing/.gitignore
index 205c922..1c22412 100644
--- a/CMSIS/DSP/Testing/.gitignore
+++ b/CMSIS/DSP/Testing/.gitignore
@@ -17,3 +17,4 @@
GeneratedSource/
*.db
TestDesc.txt
+currentConfig.csv
diff --git a/CMSIS/DSP/Testing/currentConfig.csv b/CMSIS/DSP/Testing/currentConfig.csv
deleted file mode 100644
index 08125dc..0000000
--- a/CMSIS/DSP/Testing/currentConfig.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTIMIZED,HARDFP,FASTMATH,NEON,UNROLL,ROUNDING,PLATFORM,CORE,COMPILER,VERSION
-1,1,1,1,1,0,FVP,ARMCA5,AC6,6120001
diff --git a/CMSIS/DSP/Toolchain/AC6.cmake b/CMSIS/DSP/Toolchain/AC6.cmake
index 83de49e..cb7ec76 100644
--- a/CMSIS/DSP/Toolchain/AC6.cmake
+++ b/CMSIS/DSP/Toolchain/AC6.cmake
@@ -36,7 +36,14 @@
if (ARM_CPU STREQUAL "cortex-m33" )
target_compile_options(${PROJECTNAME} PUBLIC "-mfpu=fpv5-sp-d16")
- #target_compile_options(${PROJECTNAME} PUBLIC -funsigned-char;-fshort-enums;-fshort-wchar;-ffunction-sections)
+ endif()
+
+ if (ARM_CPU STREQUAL "cortex-m7" )
+ target_compile_options(${PROJECTNAME} PUBLIC "-mfpu=fpv5-sp-d16")
+ endif()
+
+ if (ARM_CPU STREQUAL "cortex-m4" )
+ target_compile_options(${PROJECTNAME} PUBLIC "-mfpu=fpv4-sp-d16")
endif()
if (ARM_CPU STREQUAL "cortex-a9" )
diff --git a/CMSIS/DSP/configCore.cmake b/CMSIS/DSP/configCore.cmake
index b23c520..e8523c0 100644
--- a/CMSIS/DSP/configCore.cmake
+++ b/CMSIS/DSP/configCore.cmake
@@ -6,6 +6,7 @@
option(HARDFP "Hard floating point" ON)
option(LITTLEENDIAN "Little endian" ON)
+option(FASTMATHCOMPUTATIONS "Fast Math enabled" OFF)
# More detailed identification for benchmark results
SET(COREID ARMCM7)
diff --git a/CMSIS/DSP/configPlatform.cmake b/CMSIS/DSP/configPlatform.cmake
index b1e589f..4fa12f2 100644
--- a/CMSIS/DSP/configPlatform.cmake
+++ b/CMSIS/DSP/configPlatform.cmake
@@ -1,5 +1,5 @@
option(SEMIHOSTING "Test trace using printf" ON)
-option(PLATFORM "Platform" "FVP")
+SET(PLATFORM "FVP")
if (PLATFORM STREQUAL "FVP")