diff --git a/libraries/wutnewlib/wut_newlib.c b/libraries/wutnewlib/wut_newlib.c index 0e19d45f..88797e3d 100644 --- a/libraries/wutnewlib/wut_newlib.c +++ b/libraries/wutnewlib/wut_newlib.c @@ -8,8 +8,8 @@ void(*__wut_exit)(int rc); extern void __fini_wut(void); -void __attribute__((weak)) -abort(void) { +void +__wut__abort(void) { const char *error_text = "Abort called.\n"; if (OSIsDebuggerPresent()) { __asm__ __volatile__("mr 3, %0\n" // load 'tmp' into r3 @@ -23,8 +23,8 @@ abort(void) { while (1); } -void __attribute__((weak)) -__assert_func(const char *file, +void +__wut__assert_func(const char *file, int line, const char *func, const char *failedexpr) @@ -63,15 +63,6 @@ __assert_func(const char *file, while (1); } -void __attribute__((weak)) -__assert(const char *file, - int line, - const char *failedexpr) -{ - __assert_func(file, line, NULL, failedexpr); - /* NOTREACHED */ -} - void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) { return __wut_sbrk_r(ptr, incr); } @@ -144,6 +135,14 @@ int __syscall_clock_getres(clockid_t clock_id, struct timespec *res) { return __wut_clock_getres(clock_id, res); } +void __syscall_abort() { + __wut__abort(); +} + +void __syscall_assert_func(const char *file, int line, const char *func, const char *failedexpr) { + __wut__assert_func(file, line, func, failedexpr); +} + void __init_wut_newlib() {