From 0fe2214dc7856da59d9232d3d4f4fbd915c02b9f Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Wed, 15 Feb 2023 07:30:01 +0100
Subject: [PATCH] Missing header in arm_math.h added

THe new dsp/window_functions.h header was missing.
(But it could be used and included separately from arm_math.h)
---
 Include/arm_math.h                                     | 1 +
 Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj | 7 ++++---
 Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj | 7 ++++---
 Testing/cmsis_build/test.Release+VHT_M0P.cprj          | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M23.cprj          | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M3.cprj           | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M33.cprj          | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M4.cprj           | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M55.cprj          | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M7.cprj           | 5 +++--
 Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj  | 5 +++--
 Testing/cmsis_build/testac6.csolution.yml              | 1 -
 Testing/cmsis_build/testgcc.csolution.yml              | 1 -
 13 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/Include/arm_math.h b/Include/arm_math.h
index bfe3252d..59462c2a 100644
--- a/Include/arm_math.h
+++ b/Include/arm_math.h
@@ -205,6 +205,7 @@
 #include "dsp/transform_functions.h"
 #include "dsp/filtering_functions.h"
 #include "dsp/quaternion_math_functions.h"
+#include "dsp/window_functions.h"
 
 
 
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
index 0b43d420..597349f9 100644
--- a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:48:15" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:44" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -17,6 +17,7 @@
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT-Corstone-300/Release" name="test.Release+VHT-Corstone-300" outdir="out/test/VHT-Corstone-300/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
@@ -27,10 +28,10 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.2.0">
+    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.2.0" rtedir="RTE">
       <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.1.2"/>
     </component>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM" Cversion="1.2.0">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM" Cversion="1.2.0" rtedir="RTE">
       <file attr="config" category="header" name="CMSIS_Driver/Config/Baremetal/cmsis_driver_config.h" version="1.1.1"/>
       <file attr="config" category="header" name="CMSIS_Driver/Config/RTE_Device.h" version="1.1.0"/>
       <file attr="config" category="header" name="Device/Config/Baremetal/device_cfg.h" version="1.1.3"/>
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
index b7fa64f6..006fd9ea 100644
--- a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -18,6 +18,7 @@
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-310-MPS3" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT-Corstone-310/Release" name="test.Release+VHT-Corstone-310" outdir="out/test/VHT-Corstone-310/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -28,10 +29,10 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.1.0">
+    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.1.0" rtedir="RTE">
       <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.0.0"/>
     </component>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM" Cversion="1.0.1">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM" Cversion="1.0.1" rtedir="RTE">
       <file attr="config" category="header" name="CMSIS_Driver/Config/Baremetal/cmsis_driver_config.h" version="1.0.0"/>
       <file attr="config" category="header" name="CMSIS_Driver/Config/RTE_Device.h" version="1.0.0"/>
       <file attr="config" category="header" name="Device/Config/Baremetal/device_cfg.h" version="1.0.0"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
index 0c4d9811..7492c079 100644
--- a/Testing/cmsis_build/test.Release+VHT_M0P.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="NO_FPU" Dname="ARMCM0P" Dsecure="Non-secure" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M0P/Release" name="test.Release+VHT_M0P" outdir="out/test/VHT_M0P/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM0plus/Source/GCC/gcc_arm.ld" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM0plus/Source/startup_ARMCM0plus.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c" version="1.0.0"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj
index 944b0ff7..df78cd6d 100644
--- a/Testing/cmsis_build/test.Release+VHT_M23.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M23.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="NO_FPU" Dname="ARMCM23" Dsecure="Non-secure" Dtz="NO_TZ" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M23/Release" name="test.Release+VHT_M23" outdir="out/test/VHT_M23/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM23/Source/GCC/gcc_arm.ld" version="2.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM23/Source/startup_ARMCM23.c" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM23/Source/system_ARMCM23.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj
index bc11c0c3..ef0eacdd 100644
--- a/Testing/cmsis_build/test.Release+VHT_M3.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M3.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="NO_FPU" Dname="ARMCM3" Dsecure="Non-secure" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M3/Release" name="test.Release+VHT_M3" outdir="out/test/VHT_M3/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM3/Source/GCC/gcc_arm.ld" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM3/Source/startup_ARMCM3.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj
index d44e5bf6..cb9b4bbd 100644
--- a/Testing/cmsis_build/test.Release+VHT_M33.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M33.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Ddsp="DSP" Dfpu="SP_FPU" Dname="ARMCM33_DSP_FP" Dsecure="Non-secure" Dtz="NO_TZ" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M33/Release" name="test.Release+VHT_M33" outdir="out/test/VHT_M33/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM33/Source/GCC/gcc_arm.ld" version="2.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM33/Source/startup_ARMCM33.c" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM33/Source/system_ARMCM33.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj
index ec8b4240..99daf4b0 100644
--- a/Testing/cmsis_build/test.Release+VHT_M4.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M4.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="SP_FPU" Dname="ARMCM4_FP" Dsecure="Non-secure" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M4/Release" name="test.Release+VHT_M4" outdir="out/test/VHT_M4/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM4/Source/GCC/gcc_arm.ld" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM4/Source/startup_ARMCM4.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM4/Source/system_ARMCM4.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M55.cprj b/Testing/cmsis_build/test.Release+VHT_M55.cprj
index 41f8a5ab..48627c5b 100644
--- a/Testing/cmsis_build/test.Release+VHT_M55.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M55.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="ARMCM55" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M55/Release" name="test.Release+VHT_M55" outdir="out/test/VHT_M55/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="1.1.0">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="1.1.0" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM55/Source/GCC/gcc_arm.ld" version="2.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM55/Source/startup_ARMCM55.c" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM55/Source/system_ARMCM55.c" version="1.1.0"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj
index f0da7e5b..396a6ff8 100644
--- a/Testing/cmsis_build/test.Release+VHT_M7.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M7.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:50:01" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:51" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dsecure="Non-secure" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M7/Release" name="test.Release+VHT_M7" outdir="out/test/VHT_M7/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="GCC"/>
     <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math -flax-vector-conversions" compiler="GCC"/>
     <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c++11 -Ofast -ffast-math -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM7/Source/GCC/gcc_arm.ld" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/startup_ARMCM7.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/system_ARMCM7.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
index dffc8279..611295c5 100644
--- a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-13T09:48:15" tool="csolution 1.1.0"/>
+  <created timestamp="2023-02-15T07:28:44" tool="csolution 1.4.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -16,6 +16,7 @@
 
   <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dsecure="Non-secure" Dvendor="ARM:82">
     <output intdir="tmp/test/VHT_M7_UNROLLED/Release" name="test.Release+VHT_M7_UNROLLED" outdir="out/test/VHT_M7_UNROLLED/Release" rtedir="RTE" type="exe"/>
+    <options debug="off"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
@@ -26,7 +27,7 @@
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3" rtedir="RTE">
       <file attr="config" category="linkerScript" name="Device/ARM/ARMCM7/Source/ARM/ARMCM7_ac6.sct" version="1.0.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/startup_ARMCM7.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/system_ARMCM7.c" version="1.0.1"/>
diff --git a/Testing/cmsis_build/testac6.csolution.yml b/Testing/cmsis_build/testac6.csolution.yml
index c026036b..47001105 100644
--- a/Testing/cmsis_build/testac6.csolution.yml
+++ b/Testing/cmsis_build/testac6.csolution.yml
@@ -112,7 +112,6 @@ solution:
 
   build-types:
     - type: Release
-      optimize: max
       debug: off
 
   projects:
diff --git a/Testing/cmsis_build/testgcc.csolution.yml b/Testing/cmsis_build/testgcc.csolution.yml
index 99bef5fa..390849b3 100644
--- a/Testing/cmsis_build/testgcc.csolution.yml
+++ b/Testing/cmsis_build/testgcc.csolution.yml
@@ -87,7 +87,6 @@ solution:
       
   build-types:
     - type: Release
-      optimize: max
       debug: off