From 063717d90df124c58c8e6791804362400f77a0b5 Mon Sep 17 00:00:00 2001
From: Jonatan Antoni <jonatan.antoni@arm.com>
Date: Thu, 14 Dec 2017 09:26:36 +0100
Subject: [PATCH] Core(A): Changed macro __DEPRECATED to CMSIS_DEPRECATED.
 (Issue #287) __DEPRECATED conflicts with a predefined macro in GCC C++ mode.

---
 cmsis/TARGET_CORTEX_A/cmsis_armcc.h    |  4 ++--
 cmsis/TARGET_CORTEX_A/cmsis_armclang.h |  4 ++--
 cmsis/TARGET_CORTEX_A/cmsis_compiler.h | 14 +++++++-------
 cmsis/TARGET_CORTEX_A/cmsis_gcc.h      |  4 ++--
 cmsis/TARGET_CORTEX_A/cmsis_iccarm.h   |  4 ++--
 cmsis/TARGET_CORTEX_A/core_ca.h        |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmsis/TARGET_CORTEX_A/cmsis_armcc.h b/cmsis/TARGET_CORTEX_A/cmsis_armcc.h
index d20bbfaa21..cef7694a75 100644
--- a/cmsis/TARGET_CORTEX_A/cmsis_armcc.h
+++ b/cmsis/TARGET_CORTEX_A/cmsis_armcc.h
@@ -53,8 +53,8 @@
 #ifndef   __NO_RETURN
   #define __NO_RETURN                            __declspec(noreturn)
 #endif
-#ifndef   __DEPRECATED
- #define  __DEPRECATED                           __attribute__((deprecated))
+#ifndef   CMSIS_DEPRECATED
+  #define CMSIS_DEPRECATED                       __attribute__((deprecated))
 #endif
 #ifndef   __USED
   #define __USED                                 __attribute__((used))
diff --git a/cmsis/TARGET_CORTEX_A/cmsis_armclang.h b/cmsis/TARGET_CORTEX_A/cmsis_armclang.h
index 303d3e7302..8853836e0b 100644
--- a/cmsis/TARGET_CORTEX_A/cmsis_armclang.h
+++ b/cmsis/TARGET_CORTEX_A/cmsis_armclang.h
@@ -50,8 +50,8 @@
 #ifndef   __NO_RETURN
   #define __NO_RETURN                            __attribute__((__noreturn__))
 #endif
-#ifndef   __DEPRECATED
- #define  __DEPRECATED                           __attribute__((deprecated))
+#ifndef   CMSIS_DEPRECATED
+  #define CMSIS_DEPRECATED                       __attribute__((deprecated))
 #endif
 #ifndef   __USED
   #define __USED                                 __attribute__((used))
diff --git a/cmsis/TARGET_CORTEX_A/cmsis_compiler.h b/cmsis/TARGET_CORTEX_A/cmsis_compiler.h
index f94c03d3d6..d1ef182353 100644
--- a/cmsis/TARGET_CORTEX_A/cmsis_compiler.h
+++ b/cmsis/TARGET_CORTEX_A/cmsis_compiler.h
@@ -79,8 +79,8 @@
   #ifndef   __NO_RETURN
     #define __NO_RETURN               __attribute__((noreturn))
   #endif
-  #ifndef   __DEPRECATED
-   #define  __DEPRECATED              __attribute__((deprecated))
+  #ifndef   CMSIS_DEPRECATED
+    #define CMSIS_DEPRECATED          __attribute__((deprecated))
   #endif
   #ifndef   __USED
     #define __USED                    __attribute__((used))
@@ -125,8 +125,8 @@
   #ifndef   __NO_RETURN
     #define __NO_RETURN               __attribute__((noreturn))
   #endif
-  #ifndef   __DEPRECATED
-   #define  __DEPRECATED              __attribute__((deprecated))
+  #ifndef   CMSIS_DEPRECATED
+    #define CMSIS_DEPRECATED          __attribute__((deprecated))
   #endif
   #ifndef   __USED
     #define __USED                    __attribute__((used))
@@ -172,9 +172,9 @@
     #warning No compiler specific solution for __USED. __USED is ignored.
     #define __USED
   #endif
-  #ifndef   __DEPRECATED
-    #warning No compiler specific solution for __DEPRECATED. __DEPRECATED is ignored.
-    #define __DEPRECATED
+  #ifndef   CMSIS_DEPRECATED
+    #warning No compiler specific solution for CMSIS_DEPRECATED. CMSIS_DEPRECATED is ignored.
+    #define CMSIS_DEPRECATED
   #endif
   #ifndef   __WEAK
     #define __WEAK                    __weak
diff --git a/cmsis/TARGET_CORTEX_A/cmsis_gcc.h b/cmsis/TARGET_CORTEX_A/cmsis_gcc.h
index dca9279bc8..7f42293bee 100644
--- a/cmsis/TARGET_CORTEX_A/cmsis_gcc.h
+++ b/cmsis/TARGET_CORTEX_A/cmsis_gcc.h
@@ -55,8 +55,8 @@
 #ifndef   __NO_RETURN
   #define __NO_RETURN                            __attribute__((__noreturn__))
 #endif
-#ifndef   __DEPRECATED
- #define  __DEPRECATED                           __attribute__((deprecated))
+#ifndef   CMSIS_DEPRECATED
+ #define  CMSIS_DEPRECATED                       __attribute__((deprecated))
 #endif
 #ifndef   __USED
   #define __USED                                 __attribute__((used))
diff --git a/cmsis/TARGET_CORTEX_A/cmsis_iccarm.h b/cmsis/TARGET_CORTEX_A/cmsis_iccarm.h
index 287682ea68..beddfe8162 100644
--- a/cmsis/TARGET_CORTEX_A/cmsis_iccarm.h
+++ b/cmsis/TARGET_CORTEX_A/cmsis_iccarm.h
@@ -124,8 +124,8 @@
   #define __STATIC_FORCEINLINE  __FORCEINLINE __STATIC_INLINE
 #endif
 
-#ifndef   __DEPRECATED
- #define  __DEPRECATED          __attribute__((deprecated))
+#ifndef   CMSIS_DEPRECATED
+  #define CMSIS_DEPRECATED      __attribute__((deprecated))
 #endif
 
 #ifndef __UNALIGNED_UINT16_READ
diff --git a/cmsis/TARGET_CORTEX_A/core_ca.h b/cmsis/TARGET_CORTEX_A/core_ca.h
index fb83304b87..4757a04f93 100644
--- a/cmsis/TARGET_CORTEX_A/core_ca.h
+++ b/cmsis/TARGET_CORTEX_A/core_ca.h
@@ -1010,7 +1010,7 @@ __STATIC_FORCEINLINE void L1C_CleanInvalidateCache(uint32_t op) {
 * \param [in] op 0 - invalidate, 1 - clean, otherwise - invalidate and clean
 * \deprecated Use generic L1C_CleanInvalidateCache instead.
 */
-__DEPRECATED
+CMSIS_DEPRECATED
 __STATIC_FORCEINLINE void __L1C_CleanInvalidateCache(uint32_t op) {
   L1C_CleanInvalidateCache(op);
 }