From d5c54fed7858788fb6407b17cffa567d13476df3 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Mon, 8 Aug 2022 11:28:31 +0200
Subject: [PATCH] Use wut 1.1.1

---
 Dockerfile    |  2 +-
 src/crt.c     | 36 ++++++++++++++++++++++++++++++++++++
 src/imports.h |  2 +-
 src/main.cpp  | 11 ++++-------
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 src/crt.c

diff --git a/Dockerfile b/Dockerfile
index 2f60025..66d345c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM wiiuenv/devkitppc:20220801
+FROM wiiuenv/devkitppc:20220806
 
 WORKDIR project
diff --git a/src/crt.c b/src/crt.c
new file mode 100644
index 0000000..954c654
--- /dev/null
+++ b/src/crt.c
@@ -0,0 +1,36 @@
+void __init_wut_malloc();
+
+void __init_wut_newlib();
+
+void __init_wut_stdcpp();
+
+void __init_wut_devoptab();
+
+void __attribute__((weak)) __init_wut_socket();
+
+void __fini_wut_malloc();
+
+void __fini_wut_newlib();
+
+void __fini_wut_stdcpp();
+
+void __fini_wut_devoptab();
+
+void __attribute__((weak)) __fini_wut_socket();
+
+void __attribute__((weak))
+init_wut() {
+    __init_wut_malloc();
+    __init_wut_newlib();
+    __init_wut_stdcpp();
+    __init_wut_devoptab();
+    if (&__init_wut_socket) __init_wut_socket();
+}
+
+void __attribute__((weak))
+fini_wut() {
+    __fini_wut_devoptab();
+    __fini_wut_stdcpp();
+    __fini_wut_newlib();
+    __fini_wut_malloc();
+}
diff --git a/src/imports.h b/src/imports.h
index a408604..5f47fc6 100644
--- a/src/imports.h
+++ b/src/imports.h
@@ -59,7 +59,7 @@ IMPORT(OSCompareAndSwapAtomic);
 IMPORT(OSGetThreadSpecific);
 IMPORT(OSSetThreadSpecific);
 IMPORT(FSTimeToCalendarTime);
-IMPORT(OSIsDebuggerInitialized);
+IMPORT(OSSwapAtomic);
 
 IMPORT(exit);
 IMPORT(_Exit);
diff --git a/src/main.cpp b/src/main.cpp
index aa08dd4..ff9f4b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,19 +64,16 @@ bool CheckRunning() {
     return true;
 }
 
-extern "C" void __init_wut();
-extern "C" void __fini_wut();
-extern "C" void __init_wut_malloc();
+extern "C" void init_wut();
+extern "C" void fini_wut();
 
 extern "C" int _start(int argc, char **argv) __attribute__((section(".start_code")));
 extern "C" int _start(int argc, char **argv) {
-    // We need to call __init_wut_malloc somewhere so wut_malloc will be used for the memory allocation.
-    __init_wut_malloc();
     doKernelSetup();
     InitFunctionPointers();
     doKernelSetup2();
 
-    __init_wut();
+    init_wut();
 
     // Save last entry on mem2 heap to detect leaked memory
     MEMHeapHandle mem2_heap_handle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2);
@@ -105,7 +102,7 @@ extern "C" int _start(int argc, char **argv) {
         OSReport("Freed %d leaked memory blocks\n", leak_count);
     }
 
-    __fini_wut();
+    fini_wut();
 
     if (entrypoint > 0) {
         // clang-format off