From cc6de51688dec8ffc6a96d239b53bbf883cbb043 Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 12:07:02 -0500 Subject: [PATCH] Resolving warning: #2524-D: #pragma pop with no matching #pragma push : Pragma push for CC_ARM option is inside GNUC define, same hierarchy to be followed while pop --- .../TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c | 5 +++-- .../TARGET_MCU_K64F/drivers/fsl_flash.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c index fff64ed74a..c9de4ecfe9 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c @@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config) __DSB(); #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ } +#if (defined(__GNUC__)) +/* #pragma GCC pop_options */ +#else #if (defined(__CC_ARM)) #pragma pop #endif -#if (defined(__GNUC__)) -/* #pragma GCC pop_options */ #endif #if FLASH_DRIVER_IS_FLASH_RESIDENT diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c index fff64ed74a..c9de4ecfe9 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c @@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config) __DSB(); #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ } +#if (defined(__GNUC__)) +/* #pragma GCC pop_options */ +#else #if (defined(__CC_ARM)) #pragma pop #endif -#if (defined(__GNUC__)) -/* #pragma GCC pop_options */ #endif #if FLASH_DRIVER_IS_FLASH_RESIDENT