diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c index eb31a9118a739f69cf27cda304a4b6b4804b2a06..37f296fc3a171e3d241fe689fc8c6f8fb1f9732f 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 45a65e9c96a1dea14fad74ff9a8df83f71550a5c..b485bbd83608b59cd7bf08d6ad41c4de12ba9bc6 100644 --- a/components/libc/compilers/common/stdlib.c +++ b/components/libc/compilers/common/stdlib.c @@ -9,10 +9,9 @@ */ #include +#include -#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 a185b0104bf9df3c21b3cabff9ad700c516ce0bb..10155948ba7a9619728a79636f18ae5973a81e9a 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 6f833f05e462145fec743d295585ab3c45f92891..76300f76b2aca2c40eb070dc2b8b778eeb60e3c5 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); }