From e9a3088a795366929c5ff9c2757d64ae3d49ef6b Mon Sep 17 00:00:00 2001
From: Ash <quarktheawesome@gmail.com>
Date: Sun, 3 Dec 2017 11:31:30 +1100
Subject: [PATCH] [WiiU] Toolchain: Actually fix C++ constructors/destructors
 (oops!)

Looks like I temporarily forgot how external symbols work. Fixes
https://gbatemp.net/posts/7720955; hopefully we finally have C++ under
control.
---
 frontend/drivers/platform_wiiu.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index ab8a62f115..925f820652 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -525,24 +525,23 @@ void __eabi()
 __attribute__((weak))
 void __init(void)
 {
-   extern void (**const __CTOR_LIST__)(void);
-   extern void (**const __CTOR_END__)(void);
+   extern void (*const __CTOR_LIST__)(void);
+   extern void (*const __CTOR_END__)(void);
 
-   void (**ctor)(void) = __CTOR_LIST__;
-   while (ctor < __CTOR_END__) {
+   void (*const *ctor)(void) = &__CTOR_LIST__;
+   while (ctor < &__CTOR_END__) {
       (*ctor++)();
    }
 }
 
-
 __attribute__((weak))
 void __fini(void)
 {
-   extern void (**const __DTOR_LIST__)(void);
-   extern void (**const __DTOR_END__)(void);
+   extern void (*const __DTOR_LIST__)(void);
+   extern void (*const __DTOR_END__)(void);
 
-   void (**dtor)(void) = __DTOR_LIST__;
-   while (dtor < __DTOR_END__) {
+   void (*const *dtor)(void) = &__DTOR_LIST__;
+   while (dtor < &__DTOR_END__) {
       (*dtor++)();
    }
 }
@@ -654,7 +653,10 @@ void _start(int argc, char **argv)
    main(argc, argv);
 
    fsdev_exit();
-//   __fini();
+
+/* TODO: fix elf2rpl so it doesn't error with "Could not find matching symbol
+         for relocation" then uncomment this */
+// __fini();
    memoryRelease();
    SYSRelaunchTitle(0, 0);
    exit(0);