From b8d6fb29df2c15471733d534911f63c4cf7b031a Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Mon, 6 Mar 2017 06:11:49 +0000
Subject: [PATCH] Fixed warnings in ARM math library

---
 Makefile                                  | 2 +-
 lib/main/CMSIS/CM4/CoreSupport/arm_math.h | 2 +-
 lib/main/CMSIS/CM7/Include/arm_math.h     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6df224004..1b1eef68c 100644
--- a/Makefile
+++ b/Makefile
@@ -880,7 +880,7 @@ else ifeq ($(TARGET),$(filter $(TARGET),$(F1_TARGETS)))
 TARGET_SRC := $(STARTUP_SRC) $(STM32F10x_COMMON_SRC) $(TARGET_SRC)
 endif
 
-ifneq ($(filter GYROFFT,$(FEATURES)),)
+ifneq ($(filter $(TARGET),$(F4_TARGETS) $(F7_TARGETS)),)
 DSPLIB := $(ROOT)/lib/main/DSP_Lib
 DEVICE_FLAGS += -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE
 
diff --git a/lib/main/CMSIS/CM4/CoreSupport/arm_math.h b/lib/main/CMSIS/CM4/CoreSupport/arm_math.h
index 47a0124a9..de18196bb 100644
--- a/lib/main/CMSIS/CM4/CoreSupport/arm_math.h
+++ b/lib/main/CMSIS/CM4/CoreSupport/arm_math.h
@@ -5215,7 +5215,7 @@ void arm_rfft_fast_f32(
 #pragma GCC diagnostic ignored "-Wpedantic"
     /* saturate the output */
     out = (q15_t) (__SSAT((acc >> 15), 16));
-#pragma GCC diagnostic push
+#pragma GCC diagnostic pop
 
     /* Update state */
     S->state[1] = S->state[0];
diff --git a/lib/main/CMSIS/CM7/Include/arm_math.h b/lib/main/CMSIS/CM7/Include/arm_math.h
index d33f8a9b3..1cdd13220 100644
--- a/lib/main/CMSIS/CM7/Include/arm_math.h
+++ b/lib/main/CMSIS/CM7/Include/arm_math.h
@@ -4903,8 +4903,11 @@ void arm_rfft_fast_f32(
     /* acc += y[n-1] */
     acc += (q31_t) S->state[2] << 15;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
     /* saturate the output */
     out = (q15_t) (__SSAT((acc >> 15), 16));
+#pragma GCC diagnostic pop
 
     /* Update state */
     S->state[1] = S->state[0];