Merge branch 'master' into developer

1 files changed, 3 insertions, 24 deletions

diff --git a/components/libc/compilers/common/stdlib.c b/components/libc/compilers/common/stdlib.c
index b485bbd836..9d8952e99e 100644
--- a/components/libc/compilers/common/stdlib.c
+++ b/components/libc/compilers/common/stdlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -9,39 +9,18 @@
  */
 
 #include <rtthread.h>
-#include <stdlib.h>
 
 void __rt_libc_exit(int status)
 {
     rt_thread_t self = rt_thread_self();
 
-#ifdef RT_USING_MODULE
-    if (dlmodule_self())
-    {
-        dlmodule_exit(status);
-    }
-#endif
-
     if (self != RT_NULL)
     {
-        if(status == EXIT_FAILURE) /* abort() */
-        {
-            rt_kprintf("thread:%s abort!\n", self->name);
-        }
-        else /* exit() */
-        {
-            rt_kprintf("thread:%s exit:%d!\n", self->name, status);
-        }
-        rt_thread_suspend(self);
-        rt_schedule();
+        rt_kprintf("thread:%s exit:%d!\n", self->name, status);
+        rt_thread_control(self, RT_THREAD_CTRL_CLOSE, RT_NULL);
     }
 }
 
-void __rt_libc_abort(void)
-{
-    __rt_libc_exit(EXIT_FAILURE);
-}
-
 int __rt_libc_system(const char *string)
 {
     /* TODO */