File tree Expand file tree Collapse file tree 8 files changed +17
-13
lines changed
system/Middlewares/OpenAMP Expand file tree Collapse file tree 8 files changed +17
-13
lines changed Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ using std::atomic_fetch_and_explicit;
9494using std::atomic_thread_fence;
9595using std::atomic_signal_fence;
9696
97- #elif defined(HAVE_STDATOMIC_H) && !defined(__CC_ARM ) && \
97+ #elif defined(HAVE_STDATOMIC_H) && !defined(__ARMCC_VERSION ) && \
9898 !defined (__STDC_NO_ATOMICS__)
9999# include < stdint.h>
100100# include < stdatomic.h>
Original file line number Diff line number Diff line change 1616# include <metal/compiler/gcc/compiler.h>
1717#elif defined(__ICCARM__ )
1818# include <metal/compiler/iar/compiler.h>
19- #elif defined(__CC_ARM )
19+ #elif defined(__ARMCC_VERSION )
2020# error "MDK-ARM ARMCC compiler requires the GNU extentions to work correctly"
2121#else
2222# error "Missing compiler support"
Original file line number Diff line number Diff line change 1414
1515#if defined(__ICCARM__ )
1616# include <metal/compiler/iar/errno.h>
17- #elif defined(__CC_ARM )
17+ #elif defined(__ARMCC_VERSION )
1818# include <metal/compiler/armcc/errno.h>
1919#else
2020# include <errno.h>
Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ using std::atomic_fetch_and_explicit;
9494using std::atomic_thread_fence;
9595using std::atomic_signal_fence;
9696
97- #elif defined(HAVE_STDATOMIC_H) && !defined(__CC_ARM ) && \
97+ #elif defined(HAVE_STDATOMIC_H) && !defined(__ARMCC_VERSION ) && \
9898 !defined (__STDC_NO_ATOMICS__)
9999# include < stdint.h>
100100# include < stdatomic.h>
Original file line number Diff line number Diff line change 1616# include <metal/compiler/gcc/compiler.h>
1717#elif defined(__ICCARM__ )
1818# include <metal/compiler/iar/compiler.h>
19- #elif defined(__CC_ARM )
19+ #elif defined(__ARMCC_VERSION )
2020# error "MDK-ARM ARMCC compiler requires the GNU extentions to work correctly"
2121#else
2222# error "Missing compiler support"
Original file line number Diff line number Diff line change 1414
1515#if defined(__ICCARM__ )
1616# include <metal/compiler/iar/errno.h>
17- #elif defined(__CC_ARM )
17+ #elif defined(__ARMCC_VERSION )
1818# include <metal/compiler/armcc/errno.h>
1919#else
2020# include <errno.h>
Original file line number Diff line number Diff line change 1818 ******************************************************************************
1919 @endverbatim
2020
21+ ### V1.0.6/13-December-2024 ###
22+ ===============================
23+ + Fix compilation error with ARM Compiler verion 6 MDK-ARM
24+ - lib/atomic.h
25+ - lib/errno.h
26+ - lib/compiler.h
27+ - lib/include/metal/atomic.h
28+ - lib/include/metal/errno.h
29+ - lib/include/metal/compiler.h
30+
2131### V1.0.5/18-January-2022 ###
2232===============================
2333 + Integrate official release v2021.10
Original file line number Diff line number Diff line change 4646/* Private typedef -----------------------------------------------------------*/
4747/* Private define ------------------------------------------------------------*/
4848/* this string will be sent to remote processor */
49- /* Since openSTLinux distribution 4.0 with Linux 5.15,
50- RPMSG_SERVICE_NAME has been renamed from 'rpmsg-tty-channel' to 'rpmsg-tty'
51- if older distribution is used, it is required to redefine it to 'rpmsg-tty-channel'
52- */
53- #ifndef RPMSG_SERVICE_NAME
54- #define RPMSG_SERVICE_NAME "rpmsg-tty"
55- #endif
49+ #define RPMSG_SERVICE_NAME "rpmsg-tty"
5650
5751/* Private macro -------------------------------------------------------------*/
5852/* Private variables ---------------------------------------------------------*/
You can’t perform that action at this time.
0 commit comments