Remove guards against __ARMCC_VERSION version numbers that were previously used to...

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM23 / non_secure / portasm.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c b/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
index e4fbe2d68853cf15e26f7afa9172e146e4ea5e05..e57ce9db1c9395c03dc6074632d36e8d7366bac3 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
@@ -210,13 +210,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -228,14 +221,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r