diff --git a/apps/mathlib/CMSIS/Include/arm_math.h b/apps/mathlib/CMSIS/Include/arm_math.h
index fabd98be7a..f224d3eb03 100644
--- a/apps/mathlib/CMSIS/Include/arm_math.h
+++ b/apps/mathlib/CMSIS/Include/arm_math.h
@@ -5520,7 +5520,7 @@ extern "C"
     *pIa = Ialpha;
 
     /* Calculating pIb from Ialpha and Ibeta by equation pIb = -(1/2) * Ialpha + (sqrt(3)/2) * Ibeta */
-    *pIb = -0.5 * Ialpha + (float32_t) 0.8660254039 *Ibeta;
+    *pIb = -0.5f * Ialpha + (float32_t) 0.8660254039f *Ibeta;
 
   }
 
@@ -5898,7 +5898,7 @@ extern "C"
       /* Iniatilize output for below specified range as least output value of table */
       y = pYData[0];
     }
-    else if(i >= S->nValues)
+    else if((unsigned)i >= S->nValues)
     {
       /* Iniatilize output for above specified range as last output value of table */
       y = pYData[S->nValues - 1];
diff --git a/apps/mathlib/CMSIS/Makefile b/apps/mathlib/CMSIS/Makefile
index fa5de668af..9e28518bc7 100644
--- a/apps/mathlib/CMSIS/Makefile
+++ b/apps/mathlib/CMSIS/Makefile
@@ -45,6 +45,13 @@ INCLUDES		+= $(DSPLIB_SRCDIR)/Include \
 			   $(DSPLIB_SRCDIR)/Device/ARM/ARMCM4/Include \
 			   $(DSPLIB_SRCDIR)/Device/ARM/ARMCM3/Include
 
+# Suppress some warnings that ARM should fix, but haven't.
+EXTRADEFINES		+= -Wno-unsuffixed-float-constants \
+			   -Wno-sign-compare \
+			   -Wno-shadow \
+			   -Wno-float-equal \
+			   -Wno-unused-variable
+
 #
 # Override the default visibility for symbols, since the CMSIS DSPLib doesn't
 # have anything we can use to mark exported symbols.