From 869fe709ea0f2ddee28cc9f8a9e3e1dd9bfb37b2 Mon Sep 17 00:00:00 2001
From: Ash Logan <ash@heyquark.com>
Date: Tue, 9 Apr 2019 20:26:35 +1000
Subject: [PATCH] Revert "wutstdc++: Move __gxx_personality to dedicated
 Assembly file"

This reverts commit 370eeb28e94ccfcff981842bc55a16258fec252c.
I didn't know what this did, sorry.
---
 libraries/wutstdc++/wut_stdcpp.cpp           | 11 +++++++++++
 libraries/wutstdc++/wut_stdcpp_personality.s | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 libraries/wutstdc++/wut_stdcpp_personality.s

diff --git a/libraries/wutstdc++/wut_stdcpp.cpp b/libraries/wutstdc++/wut_stdcpp.cpp
index f15f6df..530e950 100644
--- a/libraries/wutstdc++/wut_stdcpp.cpp
+++ b/libraries/wutstdc++/wut_stdcpp.cpp
@@ -1,5 +1,16 @@
 #include "wut_gthread.h"
 
+__asm__ __volatile__(
+   "\t.section\t.text.__wrap___gxx_personality_v0,\"ax\",@progbits\n"
+   "\t.align\t2\n"
+   "\t.globl\t__wrap___gxx_personality_v0\n"
+   "\t.type\t__wrap___gxx_personality_v0, @function\n"
+   "__wrap___gxx_personality_v0:\n"
+   "\t.cfi_startproc\n"
+   "\tb\t__real___gxx_personality_v0\n"
+   "\t.cfi_endproc"
+);
+
 extern "C" void
 __init_wut_stdcpp()
 {
diff --git a/libraries/wutstdc++/wut_stdcpp_personality.s b/libraries/wutstdc++/wut_stdcpp_personality.s
deleted file mode 100644
index 13b9e7f..0000000
--- a/libraries/wutstdc++/wut_stdcpp_personality.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.section .text.__wrap___gxx_personality_v0,"ax",@progbits
-.align 2
-
-.globl __wrap___gxx_personality_v0
-.type __wrap___gxx_personality_v0, @function
-
-__wrap___gxx_personality_v0:
- .cfi_startproc
- b __real___gxx_personality_v0
- .cfi_endproc