diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c index 37f296fc3a171e3d241fe689fc8c6f8fb1f9732f..d17460b4137f6b8c05587a214f9a005a80ffb951 100644 --- a/components/libc/compilers/armlibc/syscalls.c +++ b/components/libc/compilers/armlibc/syscalls.c @@ -256,6 +256,7 @@ void _ttywrch(int ch) #endif } +/* for exit() and abort() */ RT_WEAK void _sys_exit(int return_code) { extern void __rt_libc_exit(int status); diff --git a/components/libc/compilers/common/stdlib.c b/components/libc/compilers/common/stdlib.c index b485bbd83608b59cd7bf08d6ad41c4de12ba9bc6..9f801ab966c3705b20e448619c67fd763a9af3c6 100644 --- a/components/libc/compilers/common/stdlib.c +++ b/components/libc/compilers/common/stdlib.c @@ -9,7 +9,6 @@ */ #include -#include void __rt_libc_exit(int status) { @@ -24,24 +23,12 @@ void __rt_libc_exit(int status) 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_kprintf("thread:%s exit:%d!\n", self->name, status); rt_thread_suspend(self); rt_schedule(); } } -void __rt_libc_abort(void) -{ - __rt_libc_exit(EXIT_FAILURE); -} - int __rt_libc_system(const char *string) { /* TODO */ diff --git a/components/libc/compilers/dlib/syscalls.c b/components/libc/compilers/dlib/syscalls.c index 10155948ba7a9619728a79636f18ae5973a81e9a..346a766d53bcdfa63fd507120ac0d1349529a7d1 100644 --- a/components/libc/compilers/dlib/syscalls.c +++ b/components/libc/compilers/dlib/syscalls.c @@ -9,16 +9,10 @@ */ #include -void exit (int status) +/* for exit() and abort() */ +void __exit (int status) { extern void __rt_libc_exit(int status); __rt_libc_exit(status); while(1); } - -void abort(void) -{ - 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 76300f76b2aca2c40eb070dc2b8b778eeb60e3c5..916922a7fe27e020524d6e7077f18eca9829f739 100644 --- a/components/libc/compilers/newlib/syscalls.c +++ b/components/libc/compilers/newlib/syscalls.c @@ -283,8 +283,8 @@ _free_r (struct _reent *ptr, void *addr) rt_free (addr); } -void -exit (int status) +__attribute__ ((noreturn)) void +_exit (int status) { extern void __rt_libc_exit(int status); __rt_libc_exit(status); @@ -303,13 +303,6 @@ void __libc_init_array(void) /* we not use __libc init_aray to initialize C++ objects */ } -void abort(void) -{ - extern void __rt_libc_abort(void); - __rt_libc_abort(); - while(1); -} - uid_t getuid(void) { return 0;