summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorMeco Man <[email protected]>2021-02-17 23:50:12 +0800
committerMeco Man <[email protected]>2021-02-17 23:50:12 +0800
commit263d856fa4025a727c0556f7fc286f79450d9932 (patch)
tree5bf4544c3630fcae9cf520ddc596c091d5c41a79 /components
parent933c54c668b8a9480a3f03c9ba3437763396a9cc (diff)
update
Diffstat (limited to 'components')
-rw-r--r--components/libc/compilers/armlibc/syscalls.c8
-rw-r--r--components/libc/compilers/common/stdlib.c13
-rw-r--r--components/libc/compilers/dlib/syscalls.c8
-rw-r--r--components/libc/compilers/newlib/syscalls.c12
4 files changed, 20 insertions, 21 deletions
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
index eb31a9118a..37f296fc3a 100644
--- a/components/libc/compilers/armlibc/syscalls.c
+++ b/components/libc/compilers/armlibc/syscalls.c
@@ -258,8 +258,8 @@ void _ttywrch(int ch)
RT_WEAK void _sys_exit(int return_code)
{
- extern void __exit__(int status);
- __exit__(return_code);
+ extern void __rt_libc_exit(int status);
+ __rt_libc_exit(return_code);
while(1);
}
@@ -306,8 +306,8 @@ int remove(const char *filename)
#else
int system(const char *string)
{
- extern int __system__(const char *string);
- return __system__(string);
+ extern int __rt_libc_system(const char *string);
+ return __rt_libc_system(string);
}
#endif
diff --git a/components/libc/compilers/common/stdlib.c b/components/libc/compilers/common/stdlib.c
index 45a65e9c96..b485bbd836 100644
--- a/components/libc/compilers/common/stdlib.c
+++ b/components/libc/compilers/common/stdlib.c
@@ -9,10 +9,9 @@
*/
#include <rtthread.h>
+#include <stdlib.h>
-#define ABORT_STATUS 1
-
-void __exit__(int status)
+void __rt_libc_exit(int status)
{
rt_thread_t self = rt_thread_self();
@@ -25,7 +24,7 @@ void __exit__(int status)
if (self != RT_NULL)
{
- if(status == ABORT_STATUS) /* abort() */
+ if(status == EXIT_FAILURE) /* abort() */
{
rt_kprintf("thread:%s abort!\n", self->name);
}
@@ -38,12 +37,12 @@ void __exit__(int status)
}
}
-void __abort__(void)
+void __rt_libc_abort(void)
{
- __exit__(ABORT_STATUS);
+ __rt_libc_exit(EXIT_FAILURE);
}
-int __system__(const char *string)
+int __rt_libc_system(const char *string)
{
/* TODO */
return 0;
diff --git a/components/libc/compilers/dlib/syscalls.c b/components/libc/compilers/dlib/syscalls.c
index a185b0104b..10155948ba 100644
--- a/components/libc/compilers/dlib/syscalls.c
+++ b/components/libc/compilers/dlib/syscalls.c
@@ -11,14 +11,14 @@
void exit (int status)
{
- extern void __exit__(int status);
- __exit__(status);
+ extern void __rt_libc_exit(int status);
+ __rt_libc_exit(status);
while(1);
}
void abort(void)
{
- extern void __abort__(void);
- __abort__();
+ extern void __rt_libc_abort(void);
+ __rt_libc_abort();
while(1);
}
diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c
index 6f833f05e4..76300f76b2 100644
--- a/components/libc/compilers/newlib/syscalls.c
+++ b/components/libc/compilers/newlib/syscalls.c
@@ -286,16 +286,16 @@ _free_r (struct _reent *ptr, void *addr)
void
exit (int status)
{
- extern void __exit__(int status);
- __exit__(status);
+ extern void __rt_libc_exit(int status);
+ __rt_libc_exit(status);
while(1);
}
void
_system(const char *s)
{
- extern int __system__(const char *string);
- __system__(s);
+ extern int __rt_libc_system(const char *string);
+ __rt_libc_system(s);
}
void __libc_init_array(void)
@@ -305,8 +305,8 @@ void __libc_init_array(void)
void abort(void)
{
- extern void __abort__(void);
- __abort__();
+ extern void __rt_libc_abort(void);
+ __rt_libc_abort();
while(1);
}