ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Core(A): Changed macro __DEPRECATED to CMSIS_DEPRECATED. (Issue #287) __DEPRECATED conflicts with a predefined macro in GCC C++ mode.

pull/5767/head
Jonatan Antoni 2017-12-14 09:26:36 +01:00 committed by adbridge
parent 91b33a2595
commit 2ced7f4c7b
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmsis/TARGET_CORTEX_A/cmsis_armcc.h
View File

@ -53,8 +53,8 @@
#ifndef __NO_RETURN #ifndef __NO_RETURN
#define __NO_RETURN __declspec(noreturn) #define __NO_RETURN __declspec(noreturn)
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __USED #ifndef __USED
#define __USED __attribute__((used)) #define __USED __attribute__((used))

4
cmsis/TARGET_CORTEX_A/cmsis_armclang.h
View File

@ -50,8 +50,8 @@
#ifndef __NO_RETURN #ifndef __NO_RETURN
#define __NO_RETURN __attribute__((__noreturn__)) #define __NO_RETURN __attribute__((__noreturn__))
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __USED #ifndef __USED
#define __USED __attribute__((used)) #define __USED __attribute__((used))

14
cmsis/TARGET_CORTEX_A/cmsis_compiler.h
View File

@ -79,8 +79,8 @@
#ifndef __NO_RETURN #ifndef __NO_RETURN
#define __NO_RETURN __attribute__((noreturn)) #define __NO_RETURN __attribute__((noreturn))
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __USED #ifndef __USED
#define __USED __attribute__((used)) #define __USED __attribute__((used))
@ -125,8 +125,8 @@
#ifndef __NO_RETURN #ifndef __NO_RETURN
#define __NO_RETURN __attribute__((noreturn)) #define __NO_RETURN __attribute__((noreturn))
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __USED #ifndef __USED
#define __USED __attribute__((used)) #define __USED __attribute__((used))
@ -172,9 +172,9 @@
#warning No compiler specific solution for __USED. __USED is ignored. #warning No compiler specific solution for __USED. __USED is ignored.
#define __USED #define __USED
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#warning No compiler specific solution for __DEPRECATED. __DEPRECATED is ignored. #warning No compiler specific solution for CMSIS_DEPRECATED. CMSIS_DEPRECATED is ignored.
#define __DEPRECATED #define CMSIS_DEPRECATED
#endif #endif
#ifndef __WEAK #ifndef __WEAK
#define __WEAK __weak #define __WEAK __weak

4
cmsis/TARGET_CORTEX_A/cmsis_gcc.h
View File

@ -55,8 +55,8 @@
#ifndef __NO_RETURN #ifndef __NO_RETURN
#define __NO_RETURN __attribute__((__noreturn__)) #define __NO_RETURN __attribute__((__noreturn__))
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __USED #ifndef __USED
#define __USED __attribute__((used)) #define __USED __attribute__((used))

4
cmsis/TARGET_CORTEX_A/cmsis_iccarm.h
View File

@ -124,8 +124,8 @@
#define __STATIC_FORCEINLINE __FORCEINLINE __STATIC_INLINE #define __STATIC_FORCEINLINE __FORCEINLINE __STATIC_INLINE
#endif #endif
#ifndef __DEPRECATED #ifndef CMSIS_DEPRECATED
#define __DEPRECATED __attribute__((deprecated)) #define CMSIS_DEPRECATED __attribute__((deprecated))
#endif #endif
#ifndef __UNALIGNED_UINT16_READ #ifndef __UNALIGNED_UINT16_READ

2
cmsis/TARGET_CORTEX_A/core_ca.h
View File

@ -1010,7 +1010,7 @@ __STATIC_FORCEINLINE void L1C_CleanInvalidateCache(uint32_t op) {
* \param [in] op 0 - invalidate, 1 - clean, otherwise - invalidate and clean * \param [in] op 0 - invalidate, 1 - clean, otherwise - invalidate and clean
* \deprecated Use generic L1C_CleanInvalidateCache instead. * \deprecated Use generic L1C_CleanInvalidateCache instead.
*/ */
__DEPRECATED CMSIS_DEPRECATED
__STATIC_FORCEINLINE void __L1C_CleanInvalidateCache(uint32_t op) { __STATIC_FORCEINLINE void __L1C_CleanInvalidateCache(uint32_t op) {
L1C_CleanInvalidateCache(op); L1C_CleanInvalidateCache(op);
} }