From 08ab8cc47d8722bf0c767990cd615cf1c427d006 Mon Sep 17 00:00:00 2001
From: Bartek Szatkowski <bulislaw@linux.com>
Date: Wed, 18 Oct 2017 11:29:48 -0500
Subject: [PATCH] CMSIS/RTX: Allow overwriting mutex ops for ARMC

---
 .../TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
index 4f1a45665a..935b286e99 100644
--- a/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
+++ b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
@@ -728,11 +728,12 @@ typedef void *mutex;
 //lint -e818 "Pointer 'm' could be declared as pointing to const"
 
 // Initialize mutex
+#if !defined(__ARMCC_VERSION) || __ARMCC_VERSION < 6010050
 __USED
+#endif
 int _mutex_initialize(mutex *m);
-int _mutex_initialize(mutex *m) {
+__WEAK int _mutex_initialize(mutex *m) {
   int result;
-
   *m = osMutexNew(NULL);
   if (*m != NULL) {
     result = 1;
@@ -744,8 +745,10 @@ int _mutex_initialize(mutex *m) {
 }
 
 // Acquire mutex
+#if !defined(__ARMCC_VERSION) || __ARMCC_VERSION < 6010050
 __USED
-void _mutex_acquire(mutex *m);
+#endif
+__WEAK void _mutex_acquire(mutex *m);
 void _mutex_acquire(mutex *m) {
   if (os_kernel_is_active() != 0U) {
     (void)osMutexAcquire(*m, osWaitForever);
@@ -753,8 +756,10 @@ void _mutex_acquire(mutex *m) {
 }
 
 // Release mutex
+#if !defined(__ARMCC_VERSION) || __ARMCC_VERSION < 6010050
 __USED
-void _mutex_release(mutex *m);
+#endif
+__WEAK void _mutex_release(mutex *m);
 void _mutex_release(mutex *m) {
   if (os_kernel_is_active() != 0U) {
     (void)osMutexRelease(*m);
@@ -762,8 +767,10 @@ void _mutex_release(mutex *m) {
 }
 
 // Free mutex
+#if !defined(__ARMCC_VERSION) || __ARMCC_VERSION < 6010050
 __USED
-void _mutex_free(mutex *m);
+#endif
+__WEAK void _mutex_free(mutex *m);
 void _mutex_free(mutex *m) {
   (void)osMutexDelete(*m);
 }