diff --git a/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example.uvprojx
index 4a9b7a9..4588034 100644
--- a/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_class_marks_example/arm_class_marks_example.uvprojx
@@ -1129,7 +1129,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1527,7 +1527,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example.uvprojx
index 978a8bf..3f19b8e 100644
--- a/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_convolution_example/arm_convolution_example.uvprojx
@@ -1139,7 +1139,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1542,7 +1542,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example.uvprojx
index 5112f69..28dde31 100644
--- a/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_dotproduct_example/arm_dotproduct_example.uvprojx
@@ -1129,7 +1129,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1527,7 +1527,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example.uvprojx
index fcb2cb2..656f632 100644
--- a/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_fft_bin_example/arm_fft_bin_example.uvprojx
@@ -1139,7 +1139,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1542,7 +1542,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example.uvprojx
index 25aabed..6e8253b 100644
--- a/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_fir_example/arm_fir_example.uvprojx
@@ -1149,7 +1149,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1557,7 +1557,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example.uvprojx
index fe8b2a3..27aa008 100644
--- a/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_graphic_equalizer_example/arm_graphic_equalizer_example.uvprojx
@@ -1149,7 +1149,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1557,7 +1557,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvprojx
index 89909fc..8cfbaa0 100644
--- a/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvprojx
@@ -1149,7 +1149,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1557,7 +1557,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example.uvprojx
index ab615f7..34e1404 100644
--- a/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_matrix_example/arm_matrix_example.uvprojx
@@ -1139,7 +1139,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1542,7 +1542,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example.uvprojx
index 3aa08b1..02d2cd1 100644
--- a/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_signal_converge_example/arm_signal_converge_example.uvprojx
@@ -1149,7 +1149,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1557,7 +1557,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example.uvprojx
index 4cf9709..4358287 100644
--- a/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_sin_cos_example/arm_sin_cos_example.uvprojx
@@ -1129,7 +1129,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1527,7 +1527,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example.uvprojx b/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example.uvprojx
index 9be66f7..3d4534c 100644
--- a/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example.uvprojx
+++ b/CMSIS/DSP/Examples/ARM/arm_variance_example/arm_variance_example.uvprojx
@@ -1129,7 +1129,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM4 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
@@ -1527,7 +1527,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM7 __FPU_PRESENT=1</Define>
+              <Define>ARM_MATH_CM7 __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Projects/ARM/arm_cortexM_math.uvprojx b/CMSIS/DSP/Projects/ARM/arm_cortexM_math.uvprojx
index 949b1d2..9f7d5a2 100644
--- a/CMSIS/DSP/Projects/ARM/arm_cortexM_math.uvprojx
+++ b/CMSIS/DSP/Projects/ARM/arm_cortexM_math.uvprojx
@@ -11021,7 +11021,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--fpmode=ieee_full</MiscControls>
-              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -12802,7 +12802,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -18145,7 +18145,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--fpmode=ieee_full</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -19926,7 +19926,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--fpmode=ieee_full</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -21707,7 +21707,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--fpmode=ieee_full</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -23488,7 +23488,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>--fpmode=ieee_full</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
diff --git a/CMSIS/DSP/Projects/GCC/arm_cortexM_math.uvprojx b/CMSIS/DSP/Projects/GCC/arm_cortexM_math.uvprojx
index 7f7e688..2ff769e 100644
--- a/CMSIS/DSP/Projects/GCC/arm_cortexM_math.uvprojx
+++ b/CMSIS/DSP/Projects/GCC/arm_cortexM_math.uvprojx
@@ -10294,7 +10294,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -11970,7 +11970,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM4, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -16998,7 +16998,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv5-sp-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -18674,7 +18674,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv5-sp-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -20350,7 +20350,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv5-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
@@ -22026,7 +22026,7 @@
             <uThumb>1</uThumb>
             <VariousControls>
               <MiscControls>-fno-strict-aliasing -ffunction-sections -fdata-sections -mfpu=fpv5-d16 -mfloat-abi=hard -ffp-contract=off</MiscControls>
-              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT = 1, ARM_MATH_BIG_ENDIAN</Define>
+              <Define>ARM_MATH_CM7, ARM_MATH_MATRIX_CHECK, ARM_MATH_ROUNDING, UNALIGNED_SUPPORT_DISABLE, __FPU_PRESENT=1U, ARM_MATH_BIG_ENDIAN</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\Include;..\..\..\Core\Include;..\..\..\Include</IncludePath>
             </VariousControls>
diff --git a/CMSIS/Lib/ARM/arm_cortexM0b_math.lib b/CMSIS/Lib/ARM/arm_cortexM0b_math.lib
index 6c3281d..4f98015 100644
--- a/CMSIS/Lib/ARM/arm_cortexM0b_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM0b_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM0l_math.lib b/CMSIS/Lib/ARM/arm_cortexM0l_math.lib
index f9b4ac9..acf2f41 100644
--- a/CMSIS/Lib/ARM/arm_cortexM0l_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM0l_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM3b_math.lib b/CMSIS/Lib/ARM/arm_cortexM3b_math.lib
index 6eb168f..0f0f326 100644
--- a/CMSIS/Lib/ARM/arm_cortexM3b_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM3b_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM3l_math.lib b/CMSIS/Lib/ARM/arm_cortexM3l_math.lib
index 25a9ea6..da8477b 100644
--- a/CMSIS/Lib/ARM/arm_cortexM3l_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM3l_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM4b_math.lib b/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
index 23d729f..c6ba39b 100644
--- a/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib b/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
index ea39f50..e69d724 100644
--- a/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM4l_math.lib b/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
index 7037e14..bb73152 100644
--- a/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib b/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
index 8242ea0..b132631 100644
--- a/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7b_math.lib b/CMSIS/Lib/ARM/arm_cortexM7b_math.lib
index efad599..857a82d 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7b_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7b_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7bfdp_math.lib b/CMSIS/Lib/ARM/arm_cortexM7bfdp_math.lib
index 6a2263b..45b18ca 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7bfdp_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7bfdp_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7bfsp_math.lib b/CMSIS/Lib/ARM/arm_cortexM7bfsp_math.lib
index e1a2c3d..add87bc 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7bfsp_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7bfsp_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7l_math.lib b/CMSIS/Lib/ARM/arm_cortexM7l_math.lib
index 2f00ee4..e9e3e30 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7l_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7l_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7lfdp_math.lib b/CMSIS/Lib/ARM/arm_cortexM7lfdp_math.lib
index d2197ab..a7c0a54 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7lfdp_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7lfdp_math.lib
Binary files differ
diff --git a/CMSIS/Lib/ARM/arm_cortexM7lfsp_math.lib b/CMSIS/Lib/ARM/arm_cortexM7lfsp_math.lib
index eb853fb..7ded81e 100644
--- a/CMSIS/Lib/ARM/arm_cortexM7lfsp_math.lib
+++ b/CMSIS/Lib/ARM/arm_cortexM7lfsp_math.lib
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM0l_math.a b/CMSIS/Lib/GCC/libarm_cortexM0l_math.a
index 6d8156b..e4c03e1 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM0l_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM0l_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM3l_math.a b/CMSIS/Lib/GCC/libarm_cortexM3l_math.a
index 7b43179..a72502b 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM3l_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM3l_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM4l_math.a b/CMSIS/Lib/GCC/libarm_cortexM4l_math.a
index 17168f7..83c1bbc 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM4l_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM4l_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a b/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
index b39dc75..cb08a1d 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM7l_math.a b/CMSIS/Lib/GCC/libarm_cortexM7l_math.a
index baad034..a10932e 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM7l_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM7l_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM7lfdp_math.a b/CMSIS/Lib/GCC/libarm_cortexM7lfdp_math.a
index 6356c07..e9f5e33 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM7lfdp_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM7lfdp_math.a
Binary files differ
diff --git a/CMSIS/Lib/GCC/libarm_cortexM7lfsp_math.a b/CMSIS/Lib/GCC/libarm_cortexM7lfsp_math.a
index d5fc7b4..7ac098e 100644
--- a/CMSIS/Lib/GCC/libarm_cortexM7lfsp_math.a
+++ b/CMSIS/Lib/GCC/libarm_cortexM7lfsp_math.a
Binary files differ
diff --git a/CMSIS/Utilities/gen_pack.bat b/CMSIS/Utilities/gen_pack.bat
index c6568cd..38898a8 100644
--- a/CMSIS/Utilities/gen_pack.bat
+++ b/CMSIS/Utilities/gen_pack.bat
@@ -82,14 +82,15 @@
 XCOPY /Q /S /Y ..\..\CMSIS\Utilities\ARM_Example.* %RELEASE_PATH%\CMSIS\SVD\*.*
 
 :: -- Utilities files 
-XCOPY /Q /S /Y ..\..\CMSIS\Utilities\CMSIS-SVD.xsd %RELEASE_PATH%\CMSIS\Utilities\*.*
-XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PACK.xsd      %RELEASE_PATH%\CMSIS\Utilities\*.*
-XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PackChk.exe   %RELEASE_PATH%\CMSIS\Utilities\*.*
-XCOPY /Q /S /Y ..\..\CMSIS\Utilities\SVDConv.exe   %RELEASE_PATH%\CMSIS\Utilities\*.*
-XCOPY /Q /S /Y ..\..\CMSIS\Utilities\SVDConv.linux %RELEASE_PATH%\CMSIS\Utilities\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\CMSIS-SVD.xsd       %RELEASE_PATH%\CMSIS\Utilities\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PACK.xsd            %RELEASE_PATH%\CMSIS\Utilities\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\PackChk.exe         %RELEASE_PATH%\CMSIS\Utilities\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\Win32\*.*           %RELEASE_PATH%\CMSIS\Utilities\Win32\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\Linux-gcc-4.4.4\*.* %RELEASE_PATH%\CMSIS\Utilities\Linux-gcc-4.4.4\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\Utilities\Linux-gcc-4.8.3\*.* %RELEASE_PATH%\CMSIS\Utilities\Linux-gcc-4.8.3\*.*
 
 :: -- index file 
-COPY ..\..\CMSIS\index.html %RELEASE_PATH%\CMSIS\index.html
+REM COPY ..\..\CMSIS\index.html %RELEASE_PATH%\CMSIS\index.html
 
 :: Generate Documentation 
 :: -- Generate doxygen files