From ac275965f2e2d3ff730d06a8962ccaaea4f027ce Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Sun, 28 Feb 2021 11:09:48 +0800
Subject: [libc][newlib] 对syscall中malloc相关桩函数做出编译调整
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/libc/compilers/newlib/syscalls.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'components/libc/compilers/newlib/syscalls.c')

diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c
index 949d8a61de..444e3960c1 100644
--- a/components/libc/compilers/newlib/syscalls.c
+++ b/components/libc/compilers/newlib/syscalls.c
@@ -189,13 +189,6 @@ _rename_r(struct _reent *ptr, const char *old, const char *new)
 #endif
 }
 
-void *
-_sbrk_r(struct _reent *ptr, ptrdiff_t incr)
-{
-    /* no use this routine to get memory */
-    return RT_NULL;
-}
-
 int
 _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
 {
@@ -258,7 +251,7 @@ _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
 #endif
 }
 
-/* Memory routine */
+#ifdef RT_USING_HEAP /* Memory routine */
 void *
 _malloc_r (struct _reent *ptr, size_t size)
 {
@@ -306,6 +299,15 @@ _free_r (struct _reent *ptr, void *addr)
     rt_free (addr);
 }
 
+#else
+void *
+_sbrk_r(struct _reent *ptr, ptrdiff_t incr)
+{
+    /* no use this routine to get memory */
+    return RT_NULL;
+}
+#endif /*RT_USING_HEAP*/
+
 /* for exit() and abort() */
 __attribute__ ((noreturn)) void
 _exit (int status)
-- 
cgit v1.3.1