From da0bb7f6295450e30fc5608a0ecc89cc8bf572b8 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Sun, 7 Nov 2021 13:24:07 -0500
Subject: [PATCH] [kservice] add RT_WEAK for rt_vsnprintf

---
 src/Kconfig    | 4 ++++
 src/kservice.c | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index e31afc25fa..f6db1c0cea 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -139,6 +139,10 @@ config RT_USING_ASM_MEMCPY
     bool
     default n
 
+config RT_USING_ASM_MEMSET
+    bool
+    default n
+
 endmenu
 
 menuconfig RT_DEBUG
diff --git a/src/kservice.c b/src/kservice.c
index 4ed30f3237..79bb115c19 100644
--- a/src/kservice.c
+++ b/src/kservice.c
@@ -115,6 +115,7 @@ int *_rt_errno(void)
 }
 RTM_EXPORT(_rt_errno);
 
+#ifndef RT_USING_ASM_MEMSET
 /**
  * This function will set the content of memory to specified value.
  *
@@ -127,7 +128,7 @@ RTM_EXPORT(_rt_errno);
  *
  * @return The address of source memory.
  */
-RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count)
+void *rt_memset(void *s, int c, rt_ubase_t count)
 {
 #ifdef RT_KSERVICE_USING_TINY_SIZE
     char *xs = (char *)s;
@@ -200,6 +201,7 @@ RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count)
 #endif /* RT_KSERVICE_USING_TINY_SIZE */
 }
 RTM_EXPORT(rt_memset);
+#endif /* RT_USING_ASM_MEMSET */
 
 #ifndef RT_USING_ASM_MEMCPY
 /**
@@ -338,7 +340,7 @@ RTM_EXPORT(rt_memmove);
  *         If the result > 0, cs is greater than ct.
  *         If the result = 0, cs is equal to ct.
  */
-RT_WEAK rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count)
+rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_ubase_t count)
 {
     const unsigned char *su1, *su2;
     int res = 0;
@@ -842,7 +844,7 @@ static char *print_number(char *buf,
  *
  * @return The number of characters actually written to buffer.
  */
-rt_int32_t rt_vsnprintf(char       *buf,
+RT_WEAK rt_int32_t rt_vsnprintf(char       *buf,
                         rt_size_t   size,
                         const char *fmt,
                         va_list     args)
-- 
GitLab