commit 614cb834a16dee6b25716a3fff2d2993e08152aa
author TTornblom <thomas.tornblom@iar.com> Wed Jun 24 10:39:44 2020 +0200
committer Jonatan Antoni <jonatan.antoni@arm.com> Thu Jun 25 14:29:59 2020 +0200
tree 7e8ef8314199f8db59469bd4020d51f09687080c
parent 9daaa7a34a5627a24009462b8fa8413a00c4fdb1

Core(M): #undef IAR standard definition of __WEAK

The IAR standard definition of __WEAK is incompatible with the
normal CMSIS definition. This fix #undef:s this definition

Change-Id: Ie4397cbf7e58faa8258425a532e01de7d31cbeae
Signed-off-by: TTornblom <thomas.tornblom@iar.com>

CMSIS/Core/Include/cmsis_iccarm.h

diff --git a/CMSIS/Core/Include/cmsis_iccarm.h b/CMSIS/Core/Include/cmsis_iccarm.h
index 7eeffca..58e8e36 100644
--- a/CMSIS/Core/Include/cmsis_iccarm.h
+++ b/CMSIS/Core/Include/cmsis_iccarm.h
@@ -7,8 +7,8 @@
 
 //------------------------------------------------------------------------------
 //
-// Copyright (c) 2017-2019 IAR Systems
-// Copyright (c) 2017-2019 Arm Limited. All rights reserved. 
+// Copyright (c) 2017-2020 IAR Systems
+// Copyright (c) 2017-2019 Arm Limited. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -238,6 +238,7 @@
   #endif
 #endif
 
+#undef __WEAK                           /* undo the definition from DLib_Defaults.h */
 #ifndef   __WEAK
   #if __ICCARM_V8
     #define __WEAK __attribute__((weak))