libs/libc/include/assert.h

@@ -1,24 +0,0 @@
-#ifndef _ASSERT_H
-#define _ASSERT_H
-
-#include <bits/macros.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    __lc_noreturn bool __assertion_failed(const char* file, int line, const char* function, const char* expr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef NDEBUG
-#define assert(expr) (void)0
-#else
-#define assert(expr) (bool)(expr) || __assertion_failed(__FILE__, __LINE__, __FUNCTION__, #expr)
-#endif
-
-#endif

libs/libc/include/bits/macros.h

@@ -1,8 +1,8 @@
 #ifndef _BITS_MACROS_H
 #define _BITS_MACROS_H
 
-#define __lc_noreturn __attribute__((noreturn))
-#define __lc_align(n) __attribute__((aligned(n)))
-#define __lc_deprecated(msg) __attribute__((deprecated(msg)))
+#define noreturn __attribute__((noreturn))
+#define align(n) __attribute__((aligned(n)))
+#define deprecated(msg) __attribute__((deprecated(msg)))
 
 #endif

libs/libc/include/luna.h

@@ -16,7 +16,7 @@ extern "C"
     unsigned int msleep(unsigned int ms);
 
     /* Prints a message to standard error and aborts the program. */
-    __lc_noreturn void __luna_abort(const char* message);
+    noreturn void __luna_abort(const char* message);
 
 #ifdef __cplusplus
 }

libs/libc/include/stdlib.h

@@ -10,10 +10,10 @@ extern "C"
 #endif
 
     /* Aborts the program. */
-    __lc_noreturn void abort();
+    noreturn void abort();
 
     /* Normally exits the program with the specified status code. */
-    __lc_noreturn void exit(int status);
+    noreturn void exit(int status);
 
     /* Registers a handler function to be run at normal program termination. */
     int atexit(void (*handler)(void));

libs/libc/include/string.h

@@ -22,8 +22,8 @@ extern "C"
     size_t strlen(const char* str);
 
     /* Copies the string src into dest. This function is unsafe, use strncpy instead. */
-    __lc_deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
-                                                                                                 const char* src);
+    deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
+                                                                                            const char* src);
 
     /* Copies at most max bytes from the string src into dest. */
     char* strncpy(char* dest, const char* src, size_t max);
@@ -32,8 +32,8 @@ extern "C"
     char* strchr(const char* str, int c);
 
     /* Concatenates the string src into dest. This function is unsafe, use strncat instead. */
-    __lc_deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
-                                                                                                 const char* src);
+    deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
+                                                                                            const char* src);
 
     /* Concatenates at most max bytes of the string src into dest. */
     char* strncat(char* dest, const char* src, size_t max);

libs/libc/include/unistd.h

@@ -25,7 +25,7 @@ extern "C"
     pid_t fork(void);
 
     /* Terminates the program with the status code status. */
-    __lc_noreturn void _exit(int status);
+    noreturn void _exit(int status);
 
     /* Calls the kernel for a specific service, determined by number. */
     long syscall(long number, ...);

libs/libc/src/assert.cpp

@@ -1,12 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-extern "C"
-{
-    __lc_noreturn bool __assertion_failed(const char* file, int line, const char* function, const char* expr)
-    {
-        fprintf(stderr, "%s:%d: %s: Assertion '%s' failed.", file, line, function, expr);
-        abort();
-    }
-}

libs/libc/src/atexit.cpp

@@ -17,7 +17,7 @@ extern "C"
         return 0;
     }
 
-    __lc_noreturn void exit(int status)
+    noreturn void exit(int status)
     {
         for (int i = 0; i < atexit_function_count; i++) { atexit_functions[i](); }
         _exit(status);

libs/libc/src/luna.cpp

@@ -17,7 +17,7 @@ extern "C"
         return (unsigned int)syscall(SYS_sleep, ms);
     }
 
-    __lc_noreturn void __luna_abort(const char* message)
+    noreturn void __luna_abort(const char* message)
     {
         fputs(message, stderr);
         abort();

libs/libc/src/stdlib.cpp

@@ -5,7 +5,7 @@
 
 extern "C"
 {
-    __lc_noreturn void abort()
+    noreturn void abort()
     {
         _exit(-1);
     }

libs/libc/src/unistd.cpp

@@ -96,7 +96,7 @@ extern "C"
         return syscall(SYS_seek, fd, offset, whence);
     }
 
-    __lc_noreturn void _exit(int status)
+    noreturn void _exit(int status)
     {
         syscall(SYS_exit, status);
         __builtin_unreachable();