From 3203c5cc85cae67ac66dcdc485f911a049e7ed5c Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Mon, 30 Dec 2019 22:24:58 +0000
Subject: [PATCH] Previously the STM32F0518 compiler setting was changed to
 enable the use of the __weak attribute - however changing the port layer to
 use #pragma weak in place of __weak means the compiler setting change is not
 required and removes the risk of introducing incompatibilities - so this
 check in reverts the compiler settings change.

---
 FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp | 2 +-
 FreeRTOS/Source/portable/IAR/ARM_CM0/port.c         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
index ea4097b44..2ce04ea22 100644
--- a/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
@@ -311,7 +311,7 @@
                 </option>
                 <option>
                     <name>CCLangConformance</name>
-                    <state>0</state>
+                    <state>1</state>
                 </option>
                 <option>
                     <name>CCSignedPlainChar</name>
diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
index 84f1e66e0..08b59f3d4 100644
--- a/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
@@ -96,6 +96,7 @@ power functionality only. */
  * file is weak to allow application writers to change the timer used to
  * generate the tick interrupt.
  */
+#pragma weak vPortSetupTimerInterrupt
 void vPortSetupTimerInterrupt( void );
 
 /*
@@ -235,7 +236,7 @@ uint32_t ulPreviousMask;
  * Setup the systick timer to generate the tick interrupts at the required
  * frequency.
  */
-__weak void vPortSetupTimerInterrupt( void )
+void vPortSetupTimerInterrupt( void )
 {
 	/* Calculate the constants required to configure the tick interrupt. */
 	#if( configUSE_TICKLESS_IDLE == 1 )