diff --git a/CMSIS/Core/Include/cmsis_gcc.h b/CMSIS/Core/Include/cmsis_gcc.h
index e59602aff..4771466f0 100644
--- a/CMSIS/Core/Include/cmsis_gcc.h
+++ b/CMSIS/Core/Include/cmsis_gcc.h
@@ -25,7 +25,7 @@
 #ifndef __CMSIS_GCC_H
 #define __CMSIS_GCC_H
 
-#pragma clang system_header   /* treat file as system include file */
+#pragma GCC system_header   /* treat file as system include file */
 
 #include <arm_acle.h>
 
diff --git a/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml b/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml
index 249791e77..3b8b78a3b 100644
--- a/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml
+++ b/CMSIS/CoreValidation/Layer/App/Validation_Cortex-M/App.clayer.yml
@@ -43,10 +43,7 @@ layer:
             - +CM0plus
             - +CM3
             - +CM4
-            - +CM4FP
             - +CM7
-            - +CM7SP
-            - +CM7DP
         - file: ../../../Source/CV_MPU_ARMv8.c
           for-context:
             - +CM23
diff --git a/CMSIS/CoreValidation/Project/Validation.csolution.yml b/CMSIS/CoreValidation/Project/Validation.csolution.yml
index 9d5bfb5b7..359bae2e5 100644
--- a/CMSIS/CoreValidation/Project/Validation.csolution.yml
+++ b/CMSIS/CoreValidation/Project/Validation.csolution.yml
@@ -7,6 +7,7 @@ solution:
     - for-compiler: GCC
       C-CPP:
         - -masm-syntax-unified
+        - -Wall
 
   packs:
     - pack: ARM::CMSIS