diff --git a/Libraries/LibC/cxxabi.cpp b/Libraries/LibC/cxxabi.cpp index 68c9e33f3ea..cc920dec89d 100644 --- a/Libraries/LibC/cxxabi.cpp +++ b/Libraries/LibC/cxxabi.cpp @@ -28,13 +28,12 @@ #include #include #include +#include //#define GLOBAL_DTORS_DEBUG extern "C" { -typedef void (*AtExitFunction)(void*); - struct __exit_entry { AtExitFunction method; void* parameter; @@ -83,4 +82,16 @@ void __cxa_finalize(void* dso_handle) } } +[[noreturn]] void __cxa_pure_virtual() +{ + ASSERT_NOT_REACHED(); +} + +extern u32 __stack_chk_guard; +u32 __stack_chk_guard = (u32)0xc6c7c8c9; + +[[noreturn]] void __stack_chk_fail() +{ + ASSERT_NOT_REACHED(); +} } // extern "C" diff --git a/Libraries/LibC/libcinit.cpp b/Libraries/LibC/libcinit.cpp index 8f97a51737f..22e7eb62e90 100644 --- a/Libraries/LibC/libcinit.cpp +++ b/Libraries/LibC/libcinit.cpp @@ -40,20 +40,4 @@ void __libc_init() __malloc_init(); __stdio_init(); } - -[[noreturn]] void __cxa_pure_virtual() __attribute__((weak)); - -[[noreturn]] void __cxa_pure_virtual() -{ - ASSERT_NOT_REACHED(); -} - -extern u32 __stack_chk_guard; -u32 __stack_chk_guard = (u32)0xc6c7c8c9; - -[[noreturn]] void __stack_chk_fail(); -[[noreturn]] void __stack_chk_fail() -{ - ASSERT_NOT_REACHED(); -} } diff --git a/Libraries/LibC/stdlib.cpp b/Libraries/LibC/stdlib.cpp index 960ba25926e..b1cea40aa00 100644 --- a/Libraries/LibC/stdlib.cpp +++ b/Libraries/LibC/stdlib.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -197,10 +198,6 @@ __attribute__((warn_unused_result)) int __generate_unique_filename(char* pattern extern "C" { -// Itanium C++ ABI methods defined in crt0.cpp -extern int __cxa_atexit(void (*function)(void*), void* paramter, void* dso_handle); -extern void __cxa_finalize(void* dso_handle); - void exit(int status) { __cxa_finalize(nullptr); diff --git a/Libraries/LibC/sys/internals.h b/Libraries/LibC/sys/internals.h index d86f616b5c5..0ddde4037b5 100644 --- a/Libraries/LibC/sys/internals.h +++ b/Libraries/LibC/sys/internals.h @@ -30,10 +30,17 @@ __BEGIN_DECLS +typedef void (*AtExitFunction)(void*); + extern void __libc_init(); extern void __malloc_init(); extern void __stdio_init(); extern void _init(); extern bool __environ_is_malloced; +int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle); +void __cxa_finalize(void* dso_handle); +[[noreturn]] void __cxa_pure_virtual() __attribute__((weak)); +[[noreturn]] void __stack_chk_fail(); + __END_DECLS