summaryrefslogtreecommitdiff
path: root/components/libc
diff options
context:
space:
mode:
Diffstat (limited to 'components/libc')
-rw-r--r--components/libc/compilers/armlibc/syscalls.c23
-rw-r--r--components/libc/compilers/common/SConscript8
-rw-r--r--components/libc/compilers/common/stdlib.c52
-rw-r--r--components/libc/compilers/dlib/syscalls.c38
-rw-r--r--components/libc/compilers/newlib/syscalls.c42
5 files changed, 70 insertions, 93 deletions
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
index 1e08ca1716..43b655e1a6 100644
--- a/components/libc/compilers/armlibc/syscalls.c
+++ b/components/libc/compilers/armlibc/syscalls.c
@@ -258,23 +258,8 @@ void _ttywrch(int ch)
RT_WEAK void _sys_exit(int return_code)
{
- rt_thread_t self = rt_thread_self();
-
-#ifdef RT_USING_MODULE
- if (dlmodule_self())
- {
- dlmodule_exit(return_code);
- }
-#endif
-
- if (self != RT_NULL)
- {
- rt_kprintf("thread:%-8.*s exit:%d!\n", RT_NAME_MAX, self->name, return_code);
- rt_thread_suspend(self);
- rt_schedule();
- }
-
- while(1); /* noreturn */
+ extern rt_inline void __exit__(int status);
+ __exit__(return_code);
}
/**
@@ -320,8 +305,8 @@ int remove(const char *filename)
#else
int system(const char *string)
{
- RT_ASSERT(0);
- for (;;);
+ extern rt_inline int __system__(const char *string);
+ return __system__(string);
}
#endif
diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript
index 8877f07f24..ecdee2637e 100644
--- a/components/libc/compilers/common/SConscript
+++ b/components/libc/compilers/common/SConscript
@@ -8,13 +8,13 @@ group = []
CPPPATH = [cwd]
if GetDepend('RT_USING_LIBC'):
- src += Glob('*.c')
+ src += Glob('*.c')
else:
- if GetDepend('RT_LIBC_USING_TIME') and not GetDepend('RT_USING_MINILIBC'):
- src += ['time.c']
+ if GetDepend('RT_LIBC_USING_TIME') and not GetDepend('RT_USING_MINILIBC'):
+ src += ['time.c']
if GetDepend('RT_USING_POSIX') == False:
- SrcRemove(src, ['unistd.c'])
+ SrcRemove(src, ['unistd.c'])
if rtconfig.CROSS_TOOL == 'keil':
CPPDEFINES = ['__CLK_TCK=RT_TICK_PER_SECOND']
diff --git a/components/libc/compilers/common/stdlib.c b/components/libc/compilers/common/stdlib.c
new file mode 100644
index 0000000000..01f18aca5f
--- /dev/null
+++ b/components/libc/compilers/common/stdlib.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2021-02-15 Meco Man first version
+ */
+
+#include <rtthread.h>
+
+#define ABORT_STATUS 2
+
+rt_inline void __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 == ABORT_STATUS) /* abort() */
+ {
+ rt_kprintf("thread:%s abort!\n", RT_NAME_MAX, self->name, status);
+ }
+ else /* exit() */
+ {
+ rt_kprintf("thread:%s exit:%d!\n", RT_NAME_MAX, self->name, status);
+ }
+ rt_thread_suspend(self);
+ rt_schedule();
+ }
+
+ while(1); /* noreturn */
+}
+
+rt_inline void __abort__(void)
+{
+ __exit__(ABORT_STATUS);
+}
+
+rt_inline int __system__(const char *string)
+{
+ /* TODO */
+ return 0;
+}
diff --git a/components/libc/compilers/dlib/syscalls.c b/components/libc/compilers/dlib/syscalls.c
index 0d5f02f952..6f16da2fcb 100644
--- a/components/libc/compilers/dlib/syscalls.c
+++ b/components/libc/compilers/dlib/syscalls.c
@@ -11,42 +11,12 @@
void 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)
- {
- rt_kprintf("thread:%-8.*s exit:%d!\n", RT_NAME_MAX, self->name, status);
- rt_thread_suspend(self);
- rt_schedule();
- }
-
- while(1); /* noreturn */
+ extern rt_inline void __exit__(int status);
+ __exit__(return_code);
}
void abort(void)
{
- rt_thread_t self = rt_thread_self();
-
-#ifdef RT_USING_MODULE
- if (dlmodule_self())
- {
- dlmodule_exit(-1);
- }
-#endif
-
- if (self != RT_NULL)
- {
- rt_kprintf("thread:%-8.*s abort!\n", RT_NAME_MAX, self->name);
- rt_thread_suspend(self);
- rt_schedule();
- }
-
- while(1); /* noreturn */
+ extern rt_inline void __abort__(void);
+ __abort__();
}
diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c
index cf98e0c3ec..7fe02eb0a0 100644
--- a/components/libc/compilers/newlib/syscalls.c
+++ b/components/libc/compilers/newlib/syscalls.c
@@ -286,30 +286,15 @@ _free_r (struct _reent *ptr, void *addr)
void
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)
- {
- rt_kprintf("thread:%-8.*s exit:%d!\n", RT_NAME_MAX, self->name, status);
- rt_thread_suspend(self);
- rt_schedule();
- }
-
- while(1); /* noreturn */
+ extern rt_inline void __exit__(int status);
+ __exit__(status);
}
void
_system(const char *s)
{
- /* not support this call */
- return;
+ extern rt_inline int __system__(const char *string);
+ __system__(string);
}
void __libc_init_array(void)
@@ -319,23 +304,8 @@ void __libc_init_array(void)
void abort(void)
{
- rt_thread_t self = rt_thread_self();
-
-#ifdef RT_USING_MODULE
- if (dlmodule_self())
- {
- dlmodule_exit(-1);
- }
-#endif
-
- if (self != RT_NULL)
- {
- rt_kprintf("thread:%-8.*s abort!\n", RT_NAME_MAX, self->name);
- rt_thread_suspend(self);
- rt_schedule();
- }
-
- while(1); /* noreturn */
+ extern rt_inline void __abort__(void);
+ __abort__();
}
uid_t getuid(void)